From 58c9d5d66387821260ba9bdd0815568039462f39 Mon Sep 17 00:00:00 2001 From: Judd Vinet Date: Mon, 26 Dec 2005 06:40:29 +0000 Subject: applied first try at sync conflict handling (VMiklos) plus a couple changes --- lib/libalpm/alpm.h | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/libalpm/alpm.h') diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 0e84d6e0..5a0ddf0a 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -235,6 +235,7 @@ enum { enum { PM_TRANS_CONV_INSTALL_IGNOREPKG, PM_TRANS_CONV_REPLACE_PKG, + PM_TRANS_CONV_CONFLICT_PKG, PM_TRANS_CONV_LOCAL_NEWER, PM_TRANS_CONV_LOCAL_UPTODATE }; -- cgit v1.2.3-2-g168b