Revert "Merge pull request #31 from shinichi-takahashi/router"

This reverts commit 9e55faa, reversing changes made to e96c4c1.
EC-CUBE · Jan 23, 2015 · 94b3d37 · 94b3d37
1 parent 9e55faa
commit 94b3d37
Show file tree

Hide file tree

Showing 583 changed files with 10,029 additions and 10,261 deletions.
diff --git a/composer.json b/composer.json
@@ -45,13 +45,5 @@
         "satooshi/php-coveralls": "dev-master",
         "phpunit/phpunit": "3.7.*",
         "phing/phing": "2.*"
-<<<<<<< HEAD
-    },
-    "autoload": {
-        "psr-0": {
-            "Eccube": "data/"
-        }
-=======
->>>>>>> e96c4c175cdfde99ea5b44f68bd09ada46bac4c3
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/data/Eccube/Api/AbstractApi.php b/data/Eccube/Api/AbstractApi.php