repositories
/
ker1415-1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of https://github.com/dopefishh/kvltpr0lvg
[ker1415-1.git]
/
caspartest~
diff --git a/caspartest~
b/caspartest~
new file mode 100644
(file)
index 0000000..
2024b2d
--- /dev/null
+++ b/
caspartest~
@@ -0,0
+1,5
@@
+<<<<<<< HEAD
+hallo dit is raar
+=======
+hoi neger
+>>>>>>> 066f320c3074b4208de85c8b555c4c7408452b4f