Skip to content
Snippets Groups Projects
Commit 01daf589 authored by Bartke Simon's avatar Bartke Simon
Browse files

Cleaned up

parent 9c35a8f1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 3 deletions
README.md
+ 4
− 3
View file @ 01daf589
......@@ -3,11 +3,12 @@
Demo GitLab-Projekt.
Hier MIT README.md
Commitet und pusht LINUX.
<<<<<<< HEAD
Jetzt Fehler produzieren, ohne vorher zu pullen.
=======
Test how it is supposed to be.
>>>>>>> e8b64a15f674523693af451c5bda555a2db34849
MERGE RESOLVED
## Getting started
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment