Composer

composer.lock

@@ -1410,11 +1410,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuditBundle.git",
-<<<<<<< HEAD
-                "reference": "b202b7ac2ba770a72d323bb1fea8291249c09096"
-=======
                 "reference": "cb662a84bc7e36c29d88504f13f449123588e293"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
             },
             "require": {
                 "simplethings/entity-audit-bundle": "^1.0"
@@ -1430,11 +1426,7 @@
                 "audit",
                 "bundle"
             ],
-<<<<<<< HEAD
-            "time": "2017-11-24T15:24:36+00:00"
-=======
             "time": "2018-06-22T11:38:27+00:00"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
         },
         {
             "name": "ik/auth-bundle",
@@ -1442,11 +1434,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
-<<<<<<< HEAD
-                "reference": "3dfe0b95b0a2d3003065b2507a9bf581d3b7c214"
-=======
                 "reference": "67612309a0afd5d2935dfb8a4bfb9da479a61361"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
             },
             "type": "library",
             "autoload": {
@@ -1461,11 +1449,7 @@
                 "auth",
                 "bundle"
             ],
-<<<<<<< HEAD
-            "time": "2017-12-05T15:22:24+00:00"
-=======
             "time": "2018-05-15T18:25:14+00:00"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1473,11 +1457,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-<<<<<<< HEAD
-                "reference": "5559a9a344140cdc43089256c2cfca2ff2ccce5b"
-=======
                 "reference": "aa9e5432f4fc70ae78b4912a68479afcf3f9137b"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
             },
             "type": "library",
             "autoload": {
@@ -1492,11 +1472,7 @@
                 "bootstrap",
                 "sonata"
             ],
-<<<<<<< HEAD
-            "time": "2017-12-19T11:28:24+00:00"
-=======
             "time": "2018-08-08T13:50:30+00:00"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
         },
         {
             "name": "ik/device-bundle",
@@ -1504,11 +1480,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-<<<<<<< HEAD
-                "reference": "549e289e09ef991900025be4994e0641efa955ef"
-=======
                 "reference": "92e389263fa941ed35eeb54e7520bc1ccccc4ce7"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
             },
             "type": "library",
             "autoload": {
@@ -1523,11 +1495,7 @@
                 "bundle",
                 "validators"
             ],
-<<<<<<< HEAD
-            "time": "2017-12-13T13:30:22+00:00"
-=======
             "time": "2018-05-11T17:07:59+00:00"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1535,11 +1503,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
-<<<<<<< HEAD
-                "reference": "285c7a279256fc613a0a8e65c6163d5b60361365"
-=======
                 "reference": "47473cde04aa24d659598a1661a89015376cfe16"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
             },
             "type": "library",
             "autoload": {
@@ -1554,11 +1518,7 @@
                 "bundle",
                 "extra-data"
             ],
-<<<<<<< HEAD
-            "time": "2017-12-11T15:48:57+00:00"
-=======
             "time": "2018-04-03T12:13:19+00:00"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1566,11 +1526,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/LeafletBundle.git",
-<<<<<<< HEAD
-                "reference": "84174321550f3b566f525fb97b66f9e28396363a"
-=======
                 "reference": "db4aba82a00ac8af06d5445c4473648959798127"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
             },
             "require": {
                 "ext-curl": "*",
@@ -1583,11 +1539,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-<<<<<<< HEAD
-            "time": "2017-12-12T17:52:51+00:00"
-=======
             "time": "2018-03-06T18:03:24+00:00"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
         },
         {
             "name": "ik/map-bundle",
@@ -1595,11 +1547,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/MapBundle.git",
-<<<<<<< HEAD
-                "reference": "9f244d40a1d7365b60f69f72a45a9e748ec8da16"
-=======
                 "reference": "6bfead82caa4fefdc56bf8060b275a56347feb70"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
             },
             "type": "library",
             "autoload": {
@@ -1614,11 +1562,7 @@
                 "bootstrap",
                 "sonata"
             ],
-<<<<<<< HEAD
-            "time": "2017-11-16T14:10:01+00:00"
-=======
             "time": "2018-08-08T13:51:34+00:00"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
         },
         {
             "name": "ik/migrations-bundle",
@@ -1626,11 +1570,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@bitbucket.org/ikflowdat/migrations.git",
-<<<<<<< HEAD
-                "reference": "db2d82800bca471cff76677b53aef5ec0ce6f374"
-=======
                 "reference": "3ffe7909ada89084c95b528a2eb3fb58dbbfe5bd"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
             },
             "type": "library",
             "autoload": {
@@ -1645,11 +1585,7 @@
                 "bundle",
                 "migrations"
             ],
-<<<<<<< HEAD
-            "time": "2017-12-21T12:10:32+00:00"
-=======
             "time": "2018-01-25T14:06:01+00:00"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1676,11 +1612,7 @@
                 "bundle",
                 "oauth"
             ],
-<<<<<<< HEAD
-            "time": "2017-10-11T14:15:38+00:00"
-=======
             "time": "2018-07-03T12:02:21+00:00"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1703,11 +1635,7 @@
                 "bundle",
                 "owner-voter"
             ],
-<<<<<<< HEAD
-            "time": "2017-06-12T15:49:24+00:00"
-=======
             "time": "2018-02-19T13:34:58+00:00"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
         },
         {
             "name": "ik/template-bundle",
@@ -1733,11 +1661,7 @@
                 "bundle",
                 "template"
             ],
-<<<<<<< HEAD
-            "time": "2017-08-02T18:42:10+00:00"
-=======
             "time": "2018-07-04T14:44:27+00:00"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
         },
         {
             "name": "ik/webservice-bundle",
@@ -1758,11 +1682,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-<<<<<<< HEAD
-            "time": "2017-10-23T15:02:50+00:00"
-=======
             "time": "2018-07-31T18:33:39+00:00"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
         },
         {
             "name": "ik/workflow-bundle",
@@ -1770,11 +1690,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-<<<<<<< HEAD
-                "reference": "360f6a217c6ebdbc7d39b608d5cc63f28dbde47e"
-=======
                 "reference": "fcac5fb3107129034dc231d900701c0df65d8a7c"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1804,11 +1720,7 @@
                 "bundle",
                 "workflow"
             ],
-<<<<<<< HEAD
-            "time": "2017-12-21T16:04:13+00:00"
-=======
             "time": "2018-08-07T12:54:41+00:00"
->>>>>>> a2c95713d0c15d2a926ef3eeed6408509a53059f
         },
         {
             "name": "incenteev/composer-parameter-handler",