mirzaev
/
site-stdm-registry
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge fuck up fix

This commit is contained in:
Arsen Mirzaev Tatyano-Muradovich 2023-02-20 18:27:04 +10:00
parent c6245c5af1
commit 2ace3384a6
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
LICENSE
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
Version 2, December 2004
@ -10,16 +9,3 @@ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. You just DO WHAT THE FUCK YOU WANT TO.
=======
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
Version 2, December 2004
Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
Everyone is permitted to copy and distribute verbatim or modified copies of this license document, and changing it is allowed as long as the name is changed.
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. You just DO WHAT THE FUCK YOU WANT TO.
>>>>>>> 0e6e9d8 (start transition from rules.mirzaev.sexy)

6
README.md
View File

@ -1,9 +1,3 @@
<<<<<<< HEAD
# stdm-registry
Interface with access to the data register with spare parts for special equipment
=======
# site-virus
Site with viruses and scary pictures
>>>>>>> 0e6e9d8 (start transition from rules.mirzaev.sexy)