Fia

trivago · Mar 2, 2018 · 7cf12f5 · 7cf12f5
1 parent 9770327
commit 7cf12f5
Show file tree

Hide file tree

Showing 6 changed files with 2,096 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
-## Ignore Visual Studio temporary files, build results, and
-/vendor/
+##This file MUST contain only project files. Please put IDE's file in a global .gitignore
+
 rumble.php
-/migrations
-/seeds
-.idea
+migrations/
+seeds/
+vendor/
diff --git a/rumble → bin/rumble b/rumble → bin/rumble
@@ -1,5 +1,6 @@
 #!/usr/bin/env php
 <?php
+
 require __DIR__ . '/../../autoload.php';
 
 use Symfony\Component\Console\Application;

diff --git a/composer.json b/composer.json
@@ -13,6 +13,13 @@
         {
             "name": "Lawrence Enehizena",
             "email": "[email protected]"
+<<<<<<< Updated upstream
+=======
+        },
+        {
+            "name": "Murillo Brendel Freitas",
+            "email": "[email protected]"
+>>>>>>> Stashed changes
         }
     ],
     "require": {
@@ -22,7 +29,7 @@
     "require-dev": {
         "phpunit/phpunit": "*"
     },
-    "bin": ["rumble"],
+    "bin": ["bin/rumble"],
     "autoload": {
         "psr-4": {
             "Rumble\\": "src/"