diff options
| author | Judd Vinet <judd@archlinux.org> | 2005-12-26 07:40:29 +0100 |
|---|---|---|
| committer | Judd Vinet <judd@archlinux.org> | 2005-12-26 07:40:29 +0100 |
| commit | 58c9d5d66387821260ba9bdd0815568039462f39 (patch) | |
| tree | d2be58f9dd495c254d8fcefcc86f7fae1d1f0121 /lib/libalpm/alpm.h | |
| parent | a074ddb85b4d1f9b90842e5a4f15e2416e3147fe (diff) | |
| download | pacman-58c9d5d66387821260ba9bdd0815568039462f39.tar.gz pacman-58c9d5d66387821260ba9bdd0815568039462f39.tar.xz | |
applied first try at sync conflict handling (VMiklos) plus a couple changes
Diffstat (limited to 'lib/libalpm/alpm.h')
| -rw-r--r-- | lib/libalpm/alpm.h | 1 |
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 }; |