Fix minor error from merging

- ugh

Fix minor error from merging
- ugh
fc5ad9c7 · David Haynes · d4b16b79 · fc5ad9c7
Commit fc5ad9c7 authored Sep 03, 2016 by David Haynes
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

weather/.meteor/versions weather/.meteor/versions +0 -1

No files found.
--- a/weather/.meteor/versions
+++ b/weather/.meteor/versions
-<<<<<<< HEAD
 autopublish@1.0.4
 autoupdate@1.2.4
 babel-compiler@5.8.24_1