From 4a5f6943f906d47166a20e4b94c96031c422ab90 Mon Sep 17 00:00:00 2001 From: Roland Schatz Date: Fri, 5 Feb 2016 14:12:53 +0100 Subject: [PATCH 1/4] Update new-file --- new-file | 1 + 1 file changed, 1 insertion(+) diff --git a/new-file b/new-file index fe50db0..8e88722 100644 --- a/new-file +++ b/new-file @@ -1,3 +1,4 @@ this is not a conflict!!! edit edit2 +edit3 From e50caebdc7192a54a4d7a4a934ca506424bfb001 Mon Sep 17 00:00:00 2001 From: Roland Schatz Date: Fri, 5 Feb 2016 14:42:51 +0100 Subject: [PATCH 2/4] Update new-file --- new-file | 1 + 1 file changed, 1 insertion(+) diff --git a/new-file b/new-file index 8e88722..42139be 100644 --- a/new-file +++ b/new-file @@ -2,3 +2,4 @@ this is not a conflict!!! edit edit2 edit3 +edit4 From 53dd8d81dfd1a96bbae00531f3f3ead258ec21bd Mon Sep 17 00:00:00 2001 From: Roland Schatz Date: Fri, 5 Feb 2016 14:45:38 +0100 Subject: [PATCH 3/4] break build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2162386..e76a700 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1 @@ -script: echo success +script: false From 4bdde8d2b84237d863d5b0f3a1571c8516a8dcb7 Mon Sep 17 00:00:00 2001 From: Roland Schatz Date: Fri, 5 Feb 2016 14:50:15 +0100 Subject: [PATCH 4/4] fix build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e76a700..2162386 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1 @@ -script: false +script: echo success