Skip to content

Commit

Permalink
fix: conflicts in Readme
Browse files Browse the repository at this point in the history
Signed-off-by: Maximilian Braun (SAP) <maximilian.braun@sap.com>
  • Loading branch information
maximilianbraun committed Oct 31, 2023
1 parent 4bbefc1 commit ba5fa70
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)

0 comments on commit ba5fa70

Please sign in to comment.