fix merge conflict

2015-12-19 10:54:44 -05:00
parent ff4c684e54
commit c504f5005d
11 changed files with 151 additions and 22 deletions
@@ -52,7 +52,7 @@
    "tag": "v1.1.3",
    "commit": "f070288446f9e78fbe16b032ddb429a8e8015ee7"
  },
-  "_source": "git://github.com/PolymerElements/paper-input.git",
-  "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/paper-input"
+  "_source": "git://github.com/polymerelements/paper-input.git",
+  "_target": "^1.0.9",
+  "_originalSource": "polymerelements/paper-input"
 }