From 2ace3384a6870f7c8f32c6303c073dbe859c9ff6 Mon Sep 17 00:00:00 2001 From: mirzaev Date: Mon, 20 Feb 2023 18:27:04 +1000 Subject: [PATCH] merge fuck up fix --- LICENSE | 14 -------------- README.md | 6 ------ 2 files changed, 20 deletions(-) diff --git a/LICENSE b/LICENSE index 98e4da7..7a3094a 100644 --- a/LICENSE +++ b/LICENSE @@ -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 - -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) diff --git a/README.md b/README.md index a229d2a..2e206d5 100644 --- a/README.md +++ b/README.md @@ -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)