Delete merge artifact

This commit is contained in:
Elias Fleckenstein 2021-10-24 20:21:54 +02:00
parent a28bfebb9b
commit 5c55ddff1e
No known key found for this signature in database
GPG Key ID: 06927A5199D6C9B2

View File

@ -81,7 +81,6 @@ If your code leads to bugs or crashes after being merged, it is your responsibil
* Fork the repository (in case you have not already)
* Do your change in a new branch
* Create a pull request to get your changes merged into master
<<<<<<< HEAD
* Keep your pull request up to date by regulary merging upstream
* After the pull request got merged, you can delete the branch