style(package): change ava version

Scrum · Mar 22, 2017 · b6e4539 · b6e4539
1 parent aef9012
commit b6e4539
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -45,11 +45,7 @@
 
   },
   "devDependencies": {
-<<<<<<< HEAD
     "ava": "*",
-=======
-    "ava": "0.18.2",
->>>>>>> origin/greenkeeper/initial
     "babel-cli": "^6.23.0",
     "ava-codemods": "^0.3.2",
     "babel-eslint": "^7.1.1",