docs(rating): cleanup after merge

pkozlowski-opensource · pkozlowski-opensource · commit 70b1a63b3a95 · 2014-01-13T22:51:14.000+01:00
diff --git a/src/rating/docs/readme.md b/src/rating/docs/readme.md
@@ -4,7 +4,6 @@ Rating directive that will take care of visualising a star rating bar.
 
 #### `<rating>` ####
 
-<<<<<<< HEAD
  * `ng-model` <i class="glyphicon glyphicon-eye-open"></i>
  	:
  	The current rate.

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ Rating directive that will take care of visualising a star rating bar.`
`4`	`4`
`5`	`5`	#### `<rating>` ####
`6`	`6`
`7`		`-<<<<<<< HEAD`
`8`	`7`	* `ng-model` <i class="glyphicon glyphicon-eye-open"></i>
`9`	`8`	`:`
`10`	`9`	`The current rate.`