namespace correction

jupitern · Feb 17, 2016 · d65d912 · d65d912
1 parent 9b55924
commit d65d912
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -14,11 +14,7 @@ Include jupitern/scheduler in your project, by adding it to your composer.json f
 ```javascript
 {
     "require": {
-<<<<<<< HEAD
-        "jupitern/scheduler": "0.*"
-=======
         "jupitern/scheduler": "1.*"
->>>>>>> 47ba5e8368b0b9d115957248417dca6ac84c9907
     }
 }
 ```