Merge branch 'nameofnewbranch'

Conflicts: readme.txt
mariopce · Oct 2, 2011 · 81c58b2 · 81c58b2
2 parents b760cfc + 42d01dc
commit 81c58b2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/readme.txt b/readme.txt
@@ -1,4 +1,4 @@
 Hello git
 Changes 
-Changes2
 new change in master branch 
+new branch changes