Allow adding core and additional Mediawiki skins. (enterprisemediawik…

…i#997)
freephile · Jun 10, 2019 · c17afb2 · c17afb2
1 parent 7ae3a55
commit c17afb2
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/roles/mediawiki/tasks/main.yml b/src/roles/mediawiki/tasks/main.yml
@@ -77,6 +77,7 @@
           ignoreSubmodules = all
 
 #
+<<<<<<< HEAD
 # SKINS
 #
 # FIXME #819: Add skins in Meza(Core|Local)Extensions.yml
@@ -129,6 +130,8 @@
   tags:
     - latest
 #
+=======
+>>>>>>> Allow adding core and additional Mediawiki skins. (#997)
 # EXTENSIONS AND SKINS
 #
 # Allow adding core and additional Mediawiki skins. (#997)