.gitignore in jquery-mask-plugin-0.1.0 vs .gitignore in jquery-mask-plugin-0.1.1

@@ -30,6 +30,10 @@
 # Gemfile.lock
 # .ruby-version
 # .ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
\ No newline at end of file
+<<<<<<< HEAD
+.rvmrc
+=======
+.rvmrc
+>>>>>>> 70e2e03053abe420f58b74f8bb2349eb63d4c77a