From 8d82fbbd3ef5f67a4d03f7a7d31bf70a5866b0a7 Mon Sep 17 00:00:00 2001
From: "Will \"Coke\" Coleda" <will@coleda.com>
Date: Fri, 11 Apr 2014 17:46:40 +0000
Subject: [PATCH] fix mergo

---
 perl6_pass_rates.csv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/perl6_pass_rates.csv b/perl6_pass_rates.csv
index 88050beb..d2d19944 100644
--- a/perl6_pass_rates.csv
+++ b/perl6_pass_rates.csv
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Impl,date,percentage,"roast sha1",pass,fail,todo,skip,plan,spec,"impl sha1",notes
 niecza,2014-04-11,70.93%,adda017,20984,544,745,1748,24021,29111,48a8de3,
 pugs,2014-04-11,00.06%,adda017,19,14733,0,1,14753,28995,9d8b59d,