Se arreglan líneas del composer.lock

composer.lock

@@ -1479,11 +1479,7 @@
                 "bootstrap",
                 "sonata"
             ],
-<<<<<<< HEAD
             "time": "2017-12-19T11:28:24+00:00"
-=======
-            "time": "2017-12-12 15:42:32"
->>>>>>> 1d8d862147f6c24c6bbfe0e05d072ab91a07fefc
         },
         {
             "name": "ik/device-bundle",
@@ -1596,11 +1592,7 @@
                 "bundle",
                 "migrations"
             ],
-<<<<<<< HEAD
             "time": "2017-12-15T14:11:27+00:00"
-=======
-            "time": "2017-12-06 17:56:15"
->>>>>>> 1d8d862147f6c24c6bbfe0e05d072ab91a07fefc
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1697,11 +1689,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-<<<<<<< HEAD
             "time": "2017-12-18T13:14:57+00:00"
-=======
-            "time": "2017-12-18 13:14:57"
->>>>>>> 1d8d862147f6c24c6bbfe0e05d072ab91a07fefc
         },
         {
             "name": "ik/workflow-bundle",
@@ -1739,11 +1727,7 @@
                 "bundle",
                 "workflow"
             ],
-<<<<<<< HEAD
             "time": "2017-12-21T11:43:15+00:00"
-=======
-            "time": "2017-11-09 15:34:00"
->>>>>>> 1d8d862147f6c24c6bbfe0e05d072ab91a07fefc
         },
         {
             "name": "incenteev/composer-parameter-handler",