瀏覽代碼

Fix merge

Julio 8 年之前
父節點
當前提交
43f77117fb
共有 2 個文件被更改,包括 1 次插入2 次删除
  1. 0 1
      composer.json
  2. 1 1
      main/inc/lib/database.lib.php

+ 0 - 1
composer.json

@@ -28,7 +28,6 @@
             "main/inc/lib",
             "plugin",
             "main/install",
-            "main/inc/lib/getid3",
             "main/survey",
             "main/inc/lib/hook"
         ]

+ 1 - 1
main/inc/lib/database.lib.php

@@ -164,7 +164,7 @@ class Database
         );
 
         AnnotationRegistry::registerFile(
-            $sysPath."vendor/symfony/doctrine-bridge/Validator/Constraints/UniqueEntity.php"
+            $sysPath."vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php"
         );
 
         // Registering gedmo extensions