From 6bcf913ceadd2ee1ddf37b0967cec7ed53654bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Bu=C3=9Fmann?= Date: Sun, 5 Jun 2022 19:17:51 +0200 Subject: [PATCH 1/2] testing push pipeline --- testfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 testfile.txt diff --git a/testfile.txt b/testfile.txt new file mode 100644 index 0000000..90bfcb5 --- /dev/null +++ b/testfile.txt @@ -0,0 +1 @@ +this is a test From ba8bf8527ea73c5620a95efcd1f5b9d33052be24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Bu=C3=9Fmann?= Date: Sun, 5 Jun 2022 19:20:21 +0200 Subject: [PATCH 2/2] testing merge conflicts on main --- testfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testfile.txt b/testfile.txt index 90bfcb5..266debf 100644 --- a/testfile.txt +++ b/testfile.txt @@ -1 +1 @@ -this is a test +this is a testfile on main