From d65d91291831ac78f8f3af45fbba09ff64a6813c Mon Sep 17 00:00:00 2001
From: Nuno <nunochaves@sapo.pt>
Date: Wed, 17 Feb 2016 18:48:28 +0000
Subject: [PATCH] namespace correction

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 78a50fd..6a4aaf2 100644
--- 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
     }
 }
 ```