fix: version de libreria

ernesthernandez · Feb 22, 2017 · 8870c33 · 8870c33
1 parent beb55f0
commit 8870c33
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -2,11 +2,7 @@
     "name": "pewpewyou/nashor-scraper",
     "type": "library",
     "description": "Nashor is a fast high-level web crawling and web scraping tool for OP.GG",
-<<<<<<< HEAD
     "version": "0.1.0.0",
-=======
-    "version": "0.0.1",
->>>>>>> 8b6edd894ae3643623133f31aae58a901546b999
     "keywords": [
         "league",
         "legends",