From 2be9a91db6232ae5e00d8ad6defb74b16f843627 Mon Sep 17 00:00:00 2001
From: Daniel Khamsing <dkhamsing@cirruspath.com>
Date: Tue, 12 Jul 2016 08:16:06 -0700
Subject: [PATCH] Cleanup

---
 contents.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contents.json b/contents.json
index 4281d63f..4698953b 100644
--- a/contents.json
+++ b/contents.json
@@ -4995,7 +4995,6 @@
       "stars": 27
     },
     {
-<<<<<<< HEAD
       "title": "Mini vMac",
       "category": ["emulators"],
       "description": "Early 68K Macintosh emulator",