From fd41eae876894951d62899c26a8f89651d9d3509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stian=20Ha=CC=8Aklev?= <shaklev@gmail.com>
Date: Sun, 29 Mar 2015 08:56:22 -0400
Subject: [PATCH] Removing chevron

---
 build-constraints.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 078e78c1..e41945f9 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -739,7 +739,6 @@ packages:
     "Francesco Mazzoli f@mazzo.li @bitonic":
         - language-c-quote
 
-<<<<<<< HEAD
     "Sönke Hahn soenkehahn@gmail.com @soenkehahn":
         - string-conversions