fix mergo

coke · Apr 11, 2014 · 8d82fbb · 8d82fbb
1 parent 0677e75
commit 8d82fbb
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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,