From b6e4539ac6e3ac9a93fac1014da3b01caf661973 Mon Sep 17 00:00:00 2001
From: Ivan Demidov <demidov@220-volt.ru>
Date: Wed, 22 Mar 2017 10:26:04 +0300
Subject: [PATCH] style(package): change ava version

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 671e7c2..9abd36b 100644
--- 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",