Rename pmconflict_t to alpm_conflict_t

Signed-off-by: Allan McRae <allan@archlinux.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c
index 67860277..1fa538da 100644
--- a/src/pacman/upgrade.c
+++ b/src/pacman/upgrade.c
@@ -118,7 +118,7 @@ int pacman_upgrade(alpm_list_t *targets)
 				break;
 			case PM_ERR_CONFLICTING_DEPS:
 				for(i = data; i; i = alpm_list_next(i)) {
-					pmconflict_t *conflict = alpm_list_getdata(i);
+					alpm_conflict_t *conflict = alpm_list_getdata(i);
 					if(strcmp(conflict->package1, conflict->reason) == 0 ||
 							strcmp(conflict->package2, conflict->reason) == 0) {
 						printf(_(":: %s and %s are in conflict\n"),