From 8da5648c04472d79b40d28a623395f6acf29853c Mon Sep 17 00:00:00 2001
From: Terence Eden <git@shkspr.mobi>
Date: Sun, 8 Sep 2024 09:03:34 +0100
Subject: [PATCH] Update README

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 9c8a686b..cebf5f21 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,6 @@
 # Super Tiny Icons
 
-<<<<<<< HEAD
 Under 1KB each! Super Tiny Web Icons are minuscule SVG versions of your favourite logos. There are currently 372 icons and the average size is _under_ 515 bytes!
-=======
-Under 1KB each! Super Tiny Web Icons are minuscule SVG versions of your favourite logos. There are currently 372 icons and the average size is _under_ 515 bytes!
->>>>>>> 243744cdde0d9070b220cb12647fedfecccca26a
 
 The logos have a 512x512 viewbox, they will fit in a circle with radius 256. They will scale up and down to suit your needs.