изменил из ветки work

john-07 · Aug 3, 2012 · 987033a · 987033a
1 parent 8367342
commit 987033a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/some.txt b/some.txt
@@ -1 +1,2 @@
-line
+line
+changed from work