@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.130 2014/02/08 09:36:00 ryoon Exp $
+$NetBSD: distinfo,v 1.131 2014/02/08 09:36:47 ryoon Exp $
 
-<<<<<<< distinfo
 SHA1 (firefox-27.0.source.tar.bz2) = ec2031385237e30be829817ac79caa8e80cc2a14
 RMD160 (firefox-27.0.source.tar.bz2) = d1c1381cbb243239804481e2891d80f0aa3131c2
 Size (firefox-27.0.source.tar.bz2) = 129222806 bytes
-=======
-SHA1 (firefox-26.0.source.tar.bz2) = f7c6642d6f62aea8d4eced48dd27aba0634edcd5
-RMD160 (firefox-26.0.source.tar.bz2) = cb791da22377519db44164bedd64254dc839e2b8
-Size (firefox-26.0.source.tar.bz2) = 127526380 bytes
->>>>>>> 1.129
 SHA1 (patch-aa) = 1013e198fc5bb157a88589625addc7256177d914
 SHA1 (patch-ak) = 6e1788b8d233d11495482af37798cc29ff3f6598
 SHA1 (patch-al) = 917ae8caae707e7d6cb41f593367aba8d6004850