Fixed merge conflict

rpg-docs/.meteor/versions

@@ -110,30 +110,17 @@ spacebars@1.0.13
 spacebars-compiler@1.0.13
 splendido:accounts-emails-field@1.2.0
 splendido:accounts-meld@1.3.1
-<<<<<<< HEAD
-srp@1.0.8
-standard-minifier-css@1.0.6
-standard-minifier-js@1.0.6
-templating@1.1.9
-templating-tools@1.0.4
 thaum:vulcanize@2.2.0
-tracker@1.0.13
-ui@1.0.11
-underscore@1.0.8
-url@1.0.9
-=======
 srp@1.0.10
 standard-minifier-js@1.2.1
 templating@1.2.15
 templating-compiler@1.2.15
 templating-runtime@1.2.15
 templating-tools@1.0.5
-thaum:vulcanize@0.0.5
 tracker@1.1.1
 ui@1.0.12
 underscore@1.0.10
 url@1.0.11
->>>>>>> update-meteor-1.4
 useraccounts:core@1.14.2
 useraccounts:iron-routing@1.14.2
 useraccounts:polymer@1.12.3