From bc8ddfacc0db485e85277ee95ac33ffee8dcb5da Mon Sep 17 00:00:00 2001
From: Jarek Jakubowski <egger1991@gmail.com>
Date: Mon, 21 Jan 2019 22:55:32 +0100
Subject: [PATCH] fix conflict

---
 src/Controller/Backend/ContentEditController.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Controller/Backend/ContentEditController.php b/src/Controller/Backend/ContentEditController.php
index ab4b9c89..af562799 100644
--- a/src/Controller/Backend/ContentEditController.php
+++ b/src/Controller/Backend/ContentEditController.php
@@ -120,15 +120,10 @@ class ContentEditController extends BaseController
             $this->updateFieldFromPost($fieldName, $fieldValue, $content, $locale);
         }
 
-<<<<<<< Updated upstream
-        if (isset($post['taxonomy'])) {
-            foreach ($post['taxonomy'] as $key => $taxonomy) {
-                $this->updateTaxonomyFromPost($key, $taxonomy, $content);
+        if (isset($formData['taxonomy'])) {
+            foreach ($formData['taxonomy'] as $fieldName => $taxonomy) {
+                $this->updateTaxonomyFromPost($fieldName, $taxonomy, $content);
             }
-=======
-        foreach ($formData['taxonomy'] as $fieldName => $taxonomy) {
-            $this->updateTaxonomyFromPost($fieldName, $taxonomy, $content);
->>>>>>> Stashed changes
         }
 
         return $content;