From e891caf97ee563e52b8f5e1f2448db2b0dc49228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sun, 17 Apr 2011 03:26:03 -0300
Subject: More merge fixes

---
 db-functions | 1 -
 1 file changed, 1 deletion(-)

diff --git a/db-functions b/db-functions
index fb20e3e..ff38d62 100644
--- a/db-functions
+++ b/db-functions
@@ -498,7 +498,6 @@ arch_repo_add() {
 	# package files might be relative to repo dir
 	pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null
 	repo-add -q "${repo}${DBEXT}" ${pkgs[@]} \
->>>>>>> 1ce0c6368d0908e25f9bd1bb8183b5f29053fac8
 		|| error "repo-add ${repo}${DBEXT} ${pkgs[@]}"
 	/usr/bin/repo-add -f -q "${repo}${FILESEXT}" ${pkgs[@]} \
 		|| error "repo-add -f ${repo}${FILESEXT} ${pkgs[@]}"
-- 
cgit v1.2.3-2-g168b