apollo-server-core: remove merge artifact from changelog

apollographql · May 3, 2018 · 17ed7aa · 17ed7aa
1 parent 50aabb5
commit 17ed7aa
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/packages/apollo-server-core/CHANGELOG.md b/packages/apollo-server-core/CHANGELOG.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Changelog
 
 ### vNEXT