applied first try at sync conflict handling (VMiklos) plus a couple changes

1 files changed, 1 insertions, 0 deletions

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
 };