From c7af3da371b1252623790451451b45dad0cdf961 Mon Sep 17 00:00:00 2001
From: Bryan Crowe <bryan@bryan-crowe.com>
Date: Tue, 1 Apr 2014 19:54:45 -0400
Subject: [PATCH] Remove leftover HEAD from merge

---
 CONTRIBUTING.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fd285ba5f..211d68744 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # How to contribute
 
 CakePHP loves to welcome your contributions. There are several ways to help out: