From ba5fa707004bb0f5615df72e5606fe5d2ee954b2 Mon Sep 17 00:00:00 2001 From: "Maximilian Braun (SAP)" Date: Tue, 31 Oct 2023 12:56:42 +0100 Subject: [PATCH] fix: conflicts in Readme Signed-off-by: Maximilian Braun (SAP) --- README.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/README.md b/README.md index 5c9beff..64c3529 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -# xp-testing -======= -# xp-testiing ->>>>>>> 352ec62 (Initial commit) -======= -# xp-testing ->>>>>>> 478ccae (Update README.md) -======= # End-to-end test framework for Crossplane providers `xp-testing` is a library enabling end-to-end tests for Crossplane providers, based on @@ -75,4 +64,3 @@ xp-testing is under the Apache 2.0 license. Initially developed by [v0lkc](https://github.com/v0lkc), [mirzakopic](https://github.com/mirzakopic) and their team at [SAP](https://github.com/SAP/). ->>>>>>> 1387da7 (chore: README.md)