github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove stray merge conflict marker from History.md.

Browse Source
This commit is contained in:
Ben Newman
2017-07-13 18:25:23 -04:00
parent eff594dacf
commit 4e2854f88b
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
History.md
View File

@@ -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,