git conficts: you can make mix of two variants

itpp-labs · Mar 7, 2016 · aecd612 · aecd612
1 parent 9b79602
commit aecd612
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/docs/git/conflicts.rst b/docs/git/conflicts.rst
@@ -14,7 +14,7 @@ What to do if you got conflicts:
   * either edit files manually:
 
     * open file with conflicts
-    * search for ``<<<`` or ``>>>`` and delete obsolete variant or make a mix of two variants.
+    * search for ``<<<`` or ``>>>`` and delete obsolete variant or make a mix of both variants.
 
   * or use following commands, if you are sure which version should be kept ::