dc inkjet cuts parts off

[talk-2018-dc18-gdr.git] / conflict.txt

diff --git a/conflict.txt b/conflict.txt
index 36a0f4193259785e1ad1f06a617dac32e6f3483c..1664b377fcd9685b5d92327e028121b52dc7628a 100644 (file)
--- a/conflict.txt
+++ b/conflict.txt
@@ -7,7 +7,8 @@ When you have resolved this problem, run "git rebase --continue".
 If you prefer to skip this patch, run "git rebase --skip" instead.
 To check out the original branch and stop rebasing, run "git rebase --abort".
 
-git-debrebase: failed command: git rebase --onto 758a5851d24245ad9a0b872785623a3f7318dcdc b2d744310556e48b37cf98d6385c554b5e9a405a
+git-debrebase: failed command: git rebase --onto 758a5851d24245ad9a0b87278562
+3a3f7318dcdc b2d744310556e48b37cf98d6385c554b5e9a405a
 
 git-debrebase: error: subprocess failed with error exit status 128
 $