fix merge message

paulmassen · Oct 3, 2017 · 4fc1c6d · 4fc1c6d
1 parent f9116ab
commit 4fc1c6d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/blueprints/seo.yaml b/blueprints/seo.yaml
@@ -7,10 +7,6 @@ form:
       fields:
         seo:
           type: tab
-<<<<<<< HEAD
-=======
-          field_classes: fixoverlap
->>>>>>> 4a28726fad51b989adf72a777f4f9e96f909e19e
           title: SEO
 
           fields:
@@ -286,7 +282,7 @@ form:
                                       type: text
                                       label: Wikipedia or official URL
                                       field_classes: togglemusicevent
-<<<<<<< HEAD
+
                     header.conditional_orga:
                       type: conditional
                       condition: "config.plugins.seo.organization ? 'true' : 'false'"
@@ -325,8 +321,7 @@ form:
                               type: text
                               label: Organization Phone
 
-=======
->>>>>>> 4a28726fad51b989adf72a777f4f9e96f909e19e
+
                     header.conditional_new_entries:
                       type: conditional
                       condition: "config.plugins.seo.event ? 'true' : 'false'"
@@ -339,11 +334,7 @@ form:
                           fields:
                             header.eventenabled:
                               type: toggle
-<<<<<<< HEAD
                               label: PLUGINS.SEO.ENABLEORGA
-=======
-                              label: PLUGINS.SEO.ENABLEEVENT
->>>>>>> 4a28726fad51b989adf72a777f4f9e96f909e19e
                               default: 0
                               options:
                                   1: PLUGIN_ADMIN.YES

diff --git a/languages.yaml b/languages.yaml
@@ -264,7 +264,6 @@ ro:
 #      FACEBOOK_DESC: ""
 #      FACEBOOK_SHAREIMG: ""
 #      FACEBOOK_PREVIEWDESC: ""
-=======
 
 #////////////////
 #LANGUAGE TEMPLATE
@@ -383,4 +382,4 @@ ro:
 #      RESTAURANT_REGION: 
 #      RESTAURANT_TELEPHONE: 
 #      ENABLE_PERSON: 
->>>>>>> 4a28726fad51b989adf72a777f4f9e96f909e19e
+
diff --git a/seo.php b/seo.php
@@ -363,7 +363,6 @@ public function onPageInitialized()
 
         }
         }
-<<<<<<< HEAD
         if (property_exists($page->header(),'orgaenabled')){
        if ($page->header()->orgaenabled and $this->config['plugins']['seo']['organization']) {
         $microdata[] = [
@@ -384,8 +383,6 @@ public function onPageInitialized()
 
        }
        }
-=======
->>>>>>> 4a28726fad51b989adf72a777f4f9e96f909e19e
         if (property_exists($page->header(),'restaurantenabled')){
         if ($page->header()->restaurantenabled and $this->config['plugins']['seo']['restaurant']) {
          if (isset($page->header()->restaurant['image'])){