c3d2/embroidery-collections
c3d2
/
embroidery-collections
2
0
Fork 0
Code Issues Pull Requests Releases Activity

fix merge error

This commit is contained in:
Winzlieb - 2023-08-31 10:06:25 +02:00
parent c9fe14df3b
commit ca9632f8cd
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -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)

2
README.md
View File

@ -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)