public
Fork of rubyspec/rubyspec
Description: RSpec-style specification for the Ruby programming language
Homepage: http://rubyspec.org
Clone URL: git://github.com/technomage/rubyspec.git
Restored .DS_Store into .gitignore, removing forgotten conflict
mernen (author)
Sun Jun 01 16:56:29 -0700 2008
commit  ac7e55472723f40f1f29c8a865755baab7c8c1a9
tree    8cede245977e77df5a0178dd58a26b31c99c2611
parent  36db763f1d774e3854d7fe20d2ca754bd2087276
...
1
2
3
4
5
6
7
...
1
2
 
3
 
 
 
0
@@ -1,7 +1,3 @@
0
 *.rbc
0
 *.swp
0
-<<<<<<< HEAD:.gitignore
0
 .DS_Store
0
-=======
0
-*.DS_Store
0
->>>>>>> peter:.gitignore

Comments

    No one has commented yet.