--- a/abbrev.stc	Wed Mar 21 14:04:27 2012 +0000
+++ b/abbrev.stc	Wed Mar 21 17:46:55 2012 +0000
@@ -66,5 +66,9 @@
 ProjectChecker ProjectChecker stx:libbasic3 'System-Support-Projects' 0
 MercurialSourceCodeManager MercurialSourceCodeManager stx:libbasic3 'System-SourceCodeManagement' 0
 InvalidChange InvalidChange stx:libbasic3 'System-Changes' 0
+<<<<<<< .working
 ProjectProblem ProjectProblem stx:libbasic3 'System-Support-Projects' 0
 
+=======
+GitSourceCodeManager GitSourceCodeManager stx:libbasic3 'System-SourceCodeManagement' 0
+>>>>>>> .merge-right.r1901