fix name conflict

nfl · Feb 24, 2017 · 8c74f52 · 8c74f52
1 parent 3dd1d6a
commit 8c74f52
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -19,11 +19,7 @@
       "email": "[email protected]"
     },
     {
-<<<<<<< HEAD
-      "name": "Alexandr Ustinov",
-=======
       "name": "Alexander Ustinov",
->>>>>>> refactoring
       "email": "[email protected]"
     }
   ],