Permalink
Browse files

Merge remote branch 'origin/master'

Conflicts:
	notes.txt
  • Loading branch information...
2 parents bda36f3 + 336818a commit 68f9033082ac23494e8bbbeff6d948d7b11b8277 @kblmn kblmn committed Mar 24, 2011
Showing with 1 addition and 2 deletions.
  1. +1 −2 notes.txt
View
@@ -151,5 +151,4 @@ The gitmaster would need to merge (git svn update?) them into the central Github
repo. This would have to happen indirectly, to a local repo that was then
pushed to Github.
-
-
+=======

0 comments on commit 68f9033

Please sign in to comment.