Permalink
Browse files

added line for rebase test

  • Loading branch information...
1 parent 0cc4653 commit d05836a4a270ea7e25d1e8e96176e67ca29e493f @bemurphy committed Apr 24, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 one.txt
View
@@ -1,3 +1,4 @@
foo a
foo b
foo c
+Adding a line in master, which I will rebase onto in feature

0 comments on commit d05836a

Please sign in to comment.