Allow adding core and additional Mediawiki skins. (enterprisemediawik…

…i#997)
freephile · Feb 17, 2020 · caf73d3 · caf73d3
1 parent e832f13
commit caf73d3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/roles/mediawiki/tasks/main.yml b/src/roles/mediawiki/tasks/main.yml
@@ -88,6 +88,7 @@
           ignoreSubmodules = all
 
 #
+<<<<<<< HEAD
 # SKINS
 #
 # FIXME #819: Add skins in Meza(Core|Local)Extensions.yml
@@ -126,8 +127,11 @@
   tags:
     - latest
 #
+=======
+>>>>>>> Allow adding core and additional Mediawiki skins. (#997)
 # EXTENSIONS AND SKINS
 #
+# Allow adding core and additional Mediawiki skins. (#997)
 - name: Set variable holding list of core skins
   include_vars:
     file: "{{ m_config_core }}/MezaCoreSkins.yml"