Merge branch 'master' of https://github.com/happyDemon/laravel-parsley

# By Kerstens Maxim # Via Kerstens Maxim * 'master' of https://github.com/happyDemon/laravel-parsley: Update composer.json Conflicts: composer.json
happyDemon · Jul 2, 2015 · 3430eee · 3430eee
2 parents d54af59 + 8d12fc5
commit 3430eee
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -8,8 +8,8 @@
             "email": "[email protected]"
         },
         {
-          "name": "Maxim 'happyDemon' Kerstens",
-          "email": "[email protected]"
+            "name": "Maxim 'happyDemon' Kerstens",
+            "email": "[email protected]"
         }
     ],
     "require": {
@@ -20,7 +20,7 @@
     },
     "autoload": {
         "psr-0": {
-            "HappyDemon\\LaravelParsley": "src/"
+            "happyDemon\\LaravelParsley": "src/"
         }
     },
     "config": {