[chromium-freeworld/f28: 6/6] fix branches
commit 2d0805bd9becb51f344ac1e5b00ab4146fb4599b
Author: Akarshan Biswas <hellbanger(a)ga-lmt-s2.biswasab.org>
Date: Tue Oct 9 22:00:28 2018 +0530
fix branches
sources | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 063da26..e3efddd 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-1779724693bdcf7b4e01ea1133abdde2 chromium-69.0.3497.100.tar.xz
-=======
da72b7ad3a595d0140ceba60e867b9b7 Ahem.ttf
288115b66e98afcc694dd6ec2896cea4 Arimo-Bold.ttf
ccaa8e13109cd38413b2932985d5eed8 Arimo-BoldItalic.ttf
@@ -20,4 +17,4 @@ f47f3969c349f68100eff6d6a60c801c Arimo-Italic.ttf
02b895625ab1d641cc25eb3261b172d4 Tinos-BoldItalic.ttf
012412bb679844077b2eb100d59f3a0f Tinos-Italic.ttf
c7b726b40d858a1f39e848b9b52a64a1 Tinos-Regular.ttf
->>>>>>> master
+