From 4e2854f88b032a756eb80ed914b4e58e1a4c90dc Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 13 Jul 2017 18:25:23 -0400
Subject: [PATCH] Remove stray merge conflict marker from History.md.

---
 History.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/History.md b/History.md
index 2a66fd74eb..68ff8fa9f1 100644
--- a/History.md
+++ b/History.md
@@ -41,7 +41,6 @@
   [`observeChanges`](https://docs.meteor.com/api/collections.html#Mongo-Cursor-observeChanges)
   [PR #8754](https://github.com/meteor/meteor/pull/8754)
   [Issue #1173](https://github.com/meteor/meteor/issues/1173)
->>>>>>> master
 
 * `reactive-dict` now supports setting initial data when defining a named
   `ReactiveDict`. No longer run migration logic when used on the server,