Fix coveralls merge

mirego · Jan 11, 2019 · 765bf04 · 765bf04
1 parent 55887ae
commit 765bf04
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/coveralls.json b/coveralls.json
@@ -1,10 +1,6 @@
 {
   "skip_files": [
-<<<<<<< HEAD
     "lib/accent/release_tasks.ex",
     "test/support"
-=======
-    "lib/accent/release_tasks.ex"
->>>>>>> Add distillery and docker setup
   ]
 }