fixed conflicts

VERSION.json

@@ -1 +1 @@
-{"major":2, "minor":7, "hotfix":4}
+{"major":2, "minor":8, "hotfix":0}

composer.json

@@ -18,7 +18,9 @@
         "robmorgan/phinx": "0.5.*",
         "monarc/core": "dev-master",
         "monarc/backoffice": "dev-master",
-        "phing/phing": "~2.0"
+        "phing/phing": "~2.0",
+        "ramsey/uuid": "^3.8",
+        "ramsey/uuid-doctrine": "^1.5"
     },
     "config": {
         "bin-dir": "bin/"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "MONARC",
-  "version": "2.7.4",
+  "version": "2.8.0",
   "description": "MONARC back office",
   "private": true,
   "repository": {

vagrant/Vagrantfile

@@ -53,7 +53,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #
   #   # Use VBoxManage to customize the VM. For example to change memory:
   vb.customize ["modifyvm", :id, "--memory", "2048"]
-  vb.customize ["modifyvm", :id, "--name", "MONARC BO - Ubuntu 18.04 - DEV"]
+  vb.customize ["modifyvm", :id, "--name", "MONARC BO - Ubuntu 18.04 - DEV - 2019-02-21"]
   end
   #
   # View the documentation for the provider you're using for more