From 01ca0d7be7bf439e1aa81c62f85ee74b5f215073 Mon Sep 17 00:00:00 2001
From: "CONJURE046260\\admin" <yvan.richer@gmail.com>
Date: Mon, 21 Nov 2016 20:13:30 -0500
Subject: [PATCH] CMADE 2

---
 CNAME | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CNAME b/CNAME
index 4030873..91f409d 100644
--- a/CNAME
+++ b/CNAME
@@ -1,5 +1 @@
-<<<<<<< HEAD
 mtlgamejam.org
-=======
-mtlgamejam.org
->>>>>>> 59719ad6e5371ff3f4233369db5c6749e1d3970b