Change all files in stable to force a merge conflict Change-Id: Id6d445c603e54202845510f9cbd6cb00290bcad4
diff --git a/a.txt b/a.txt index c25bd37..82a689b 100644 --- a/a.txt +++ b/a.txt
@@ -1 +1 @@ -AAA some other content diff +changing text for a merge conflict
diff --git a/b.txt b/b.txt index 2ef267e..fe696a1 100644 --- a/b.txt +++ b/b.txt
@@ -1 +1 @@ -some content +changeing test for a merge conflict
diff --git a/c.txt b/c.txt index b680eed..a075f5c 100644 --- a/c.txt +++ b/c.txt
@@ -1 +1 @@ -test content 5 +losing the ability to write
diff --git a/d.txt b/d.txt index 75db990..77e612d 100644 --- a/d.txt +++ b/d.txt
@@ -1 +1 @@ -content 4 +Bogus text, bitte ignorieren
diff --git a/e.txt b/e.txt index 8dc57bc..d523a15 100644 --- a/e.txt +++ b/e.txt
@@ -1 +1 @@ -content 6 +Change conteing for a merge conflict