Tidy Merge

Link2Twenty · May 20, 2017 · 88368d3 · 88368d3
1 parent dce09e7
commit 88368d3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/bower.json b/bower.json
@@ -1,10 +1,6 @@
 {
 	"name": "l2t-paper-rating",
-<<<<<<< HEAD
 	"version": "1.1.0",
-=======
-	"version": "1.0.4",
->>>>>>> d8aa598733b13a75cb2ab69dc2c60c4cb00fd862
 	"description": "A polymer element to display &#34;star&#34; ratings in a paper style",
 	"main": "l2t-paper-rating.html",
 	"dependencies": {

diff --git a/l2t-paper-rating.html b/l2t-paper-rating.html
@@ -7,20 +7,12 @@
 ### Examples:
 
     <l2t-paper-rating></l2t-paper-rating>
-<<<<<<< HEAD
-    
-=======
 
->>>>>>> d8aa598733b13a75cb2ab69dc2c60c4cb00fd862
 Use `rating` and `total` to specify current rating and maximum rating
 respectively.  Defaults are 1 and 5.
 
     <l2t-paper-rating rating="7" total="10"></l2t-paper-rating>
-<<<<<<< HEAD
-    
-=======
 
->>>>>>> d8aa598733b13a75cb2ab69dc2c60c4cb00fd862
 ### Styling
 The following custom properties and mixins are available for styling:
 
@@ -41,7 +33,7 @@
     <style>
     :host {
       display: block;
-      --paper-icon-button-ink-color: var(--rating-ink-color, --primary-text-color);
+      --paper-icon-button-ink-color: var(--rating-ink-color, --primary-text-color)
     }
     .stars {
       display: inline-flex