Permalink
Browse files

committed text

  • Loading branch information...
2 parents 91687a3 + db78661 commit 898e5a01faec877465f512697da0fdc984cd8960 Joe Catera committed May 3, 2012
Showing with 4 additions and 0 deletions.
  1. +4 −0 status.rst
View
@@ -1,2 +1,6 @@
We're up to "Branch" on page 42 in the Progit book.
+<<<<<<< HEAD
In iss53 branch.
+=======
+Experimenting with branching.
+>>>>>>> master

0 comments on commit 898e5a0

Please sign in to comment.