Skip to content

Commit 69a64c1

Browse files
committed
#120 GIT Merge information displayed in the README.md file
1 parent 73a0dd0 commit 69a64c1

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,7 @@ We provide also three samples :
8181
| 'ng_typecheck_regexp': 2 | You should use the angular.isRegexp method instead of the default JavaScript implementation (toString.call(/^A/) === "[object RegExp]"). |
8282
| 'ng_typecheck_string': 2 | You should use the angular.isString method instead of the default JavaScript implementation (typeof "" === "[object String]"). |
8383
| 'ng_window_service': 2 | Instead of the default window object, you should prefer the AngularJS wrapper service $window. [Y180](https://github.com/johnpapa/angular-styleguide#style-y180) |
84-
<<<<<<< HEAD
85-
=======
8684

87-
>>>>>>> 0.0.9
8885

8986
# Need your help
9087
It is an opensource project. Any help will be very useful. You can :

0 commit comments

Comments
 (0)