From c1701de09374236281d16e65fc5143e6c7167feb Mon Sep 17 00:00:00 2001
From: Kevin Cunanan <kevin.a.cunanan@gmail.com>
Date: Sun, 5 Jan 2020 18:23:38 -0800
Subject: [PATCH] fixed merge conflicts oops

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

diff --git a/README.md b/README.md
index 49d6181..c8c850a 100644
--- a/README.md
+++ b/README.md
@@ -36,15 +36,9 @@
 ## Parts
 * Intel Core i9-9900k
 * ASRock Z390 Phantom Gaming-ITX/AC
-<<<<<<< HEAD
-* ~~AMD RX580~~ Sapphire RX570
-* 16gb (2 x 8gb) Corsair Vengeance LPX DDR4 3200MHz
-* ~~AIO H100i Pro Liquid CPU Cooler~~ Noctua NH-D9L
-=======
 * AMD Sapphire RX570
 * 16gb (2 x 8gb) Corsair Vengeance LPX DDR4 3200MHz
 * Noctua NH-DL9
->>>>>>> be95be762bdcf8955c7a96ffd8c5186dbe47bc8f
 * Samsung 970 EVO 500gb - NVMe PCIe M.2.
 * WD Blue 3D NAND 1TB PC SSD
 * Broadcom BCM94352Z (Dell DW1560)
@@ -74,11 +68,6 @@
 
 ## Still Testing
 * iMessage
-<<<<<<< HEAD
-* Thunderbolt
-* Sidecar
-=======
->>>>>>> be95be762bdcf8955c7a96ffd8c5186dbe47bc8f
 
 <a name="installation"></a>