Permalink
Browse files

resolve conflicts

Merge branch 'master' of http://github.com/mitra/test

Conflicts:
	README
  • Loading branch information...
2 parents 4a766ed + 550020a commit e42eff8371c9b2421ce3ac25867310c08820e8c3 rohan puri committed Oct 1, 2010
Showing with 2 additions and 1 deletion.
  1. +1 −1 README
  2. +1 −0 more
View
2 README
@@ -1,3 +1,3 @@
This is a test repository. To play around and understand git hub
My name is rohan
-
+Neependra
View
1 more
@@ -0,0 +1 @@
+added more files

0 comments on commit e42eff8

Please sign in to comment.