From ca9632f8cdb79d3d643c2d37f12030cde788b279 Mon Sep 17 00:00:00 2001 From: winzlieb Date: Thu, 31 Aug 2023 10:06:25 +0200 Subject: [PATCH] fix merge error --- LICENSE | 2 -- README.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/LICENSE b/LICENSE index 4a7a475..4b0c17e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,3 @@ -<<<<<<< HEAD Creative Commons Attribution 1.0 CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DRAFT LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. @@ -201,4 +200,3 @@ express Statement of Purpose. d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work. ->>>>>>> 5863bee (Initial commit) diff --git a/README.md b/README.md index ea5d704..aff52c6 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ -<<<<<<< HEAD # embroidery-collections A collection of embroidery patterns created with inkstitch ======= # embroidery-patterns a collection of designs created with tools like inkstitch for embroidery ->>>>>>> 5863bee (Initial commit)