diff options
| author | Dan McGee <dan@archlinux.org> | 2010-10-13 22:46:04 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-10-13 22:46:04 -0500 |
| commit | 68b50c81c79bcf01db0fd66ff523f32cc0dc67e9 (patch) | |
| tree | e11e6be57e2ff49a67390e4659801190a0282375 /lib/libalpm/conflict.c | |
| parent | 6eedf06fcc224648155bc5253d6fe1975be8da00 (diff) | |
| parent | 24d77291da93fcd5d09df2b1d1d05474616f18a5 (diff) | |
Merge remote branch 'allan/backend'
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 694c38db..f3cb9b59 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -38,7 +38,6 @@ #include "trans.h" #include "util.h" #include "log.h" -#include "cache.h" #include "deps.h" pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, const char *reason) |