Überreste von einem Merge-Konflikt gelöscht
This commit is contained in:
parent
fd3e29d00c
commit
fa18887533
12
Themen.org
12
Themen.org
|
@ -115,15 +115,3 @@
|
||||||
|
|
||||||
|
|
||||||
** Jabber/XMPP
|
** Jabber/XMPP
|
||||||
<<<<<<< HEAD
|
|
||||||
** JMStV
|
|
||||||
=======
|
|
||||||
|
|
||||||
** HTTP
|
|
||||||
Was ist das Hypertext Transfer Protocol?
|
|
||||||
|
|
||||||
** HTTP/2
|
|
||||||
|
|
||||||
** git
|
|
||||||
Wie funktioniert git?
|
|
||||||
>>>>>>> 968fc777fc750eaa4e4d6ca7a1fcc858cd2893e1
|
|
||||||
|
|
Loading…
Reference in a new issue