From c1c33edb47fb9ebdd93a61aad2903eb27c11e5af Mon Sep 17 00:00:00 2001 From: "jason.chen" Date: Fri, 23 Aug 2019 06:09:44 +0000 Subject: [PATCH 1/4] test --- pipeline-pr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/pipeline-pr.yml b/pipeline-pr.yml index 91b65d5..803d042 100644 --- a/pipeline-pr.yml +++ b/pipeline-pr.yml @@ -187,4 +187,3 @@ jobs: params: path: github-machete-pr status: success - From d38fb064d2438fa624ad3c337c071cad94eafefe Mon Sep 17 00:00:00 2001 From: "jason.chen" Date: Fri, 23 Aug 2019 06:11:27 +0000 Subject: [PATCH 2/4] test --- pipeline-pr.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pipeline-pr.yml b/pipeline-pr.yml index 803d042..f695592 100644 --- a/pipeline-pr.yml +++ b/pipeline-pr.yml @@ -187,3 +187,5 @@ jobs: params: path: github-machete-pr status: success + + From 8e1bc4606f030b4f69ddd0ac15d4aea375132403 Mon Sep 17 00:00:00 2001 From: "jason.chen" Date: Fri, 23 Aug 2019 06:15:00 +0000 Subject: [PATCH 3/4] test --- pipeline-pr.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pipeline-pr.yml b/pipeline-pr.yml index f695592..803d042 100644 --- a/pipeline-pr.yml +++ b/pipeline-pr.yml @@ -187,5 +187,3 @@ jobs: params: path: github-machete-pr status: success - - From e5cd85b72f298732ad8fa118748dcc9acda85966 Mon Sep 17 00:00:00 2001 From: "jason.chen" Date: Fri, 23 Aug 2019 06:21:41 +0000 Subject: [PATCH 4/4] final test. --- pipeline-pr.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pipeline-pr.yml b/pipeline-pr.yml index ed4691e..9eee1fc 100644 --- a/pipeline-pr.yml +++ b/pipeline-pr.yml @@ -186,9 +186,4 @@ jobs: - put: github-machete-pr params: path: github-machete-pr - status: success -<<<<<<< HEAD -======= - - ->>>>>>> master + status: success \ No newline at end of file