Rename pmfileconflict_t to alpm_fileconflict_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 1fa538da..7f6e0986 100644
--- a/src/pacman/upgrade.c
+++ b/src/pacman/upgrade.c
@@ -168,7 +168,7 @@ int pacman_upgrade(alpm_list_t *targets)
 		switch(err) {
 			case PM_ERR_FILE_CONFLICTS:
 				for(i = data; i; i = alpm_list_next(i)) {
-					pmfileconflict_t *conflict = alpm_list_getdata(i);
+					alpm_fileconflict_t *conflict = alpm_list_getdata(i);
 					switch(conflict->type) {
 						case PM_FILECONFLICT_TARGET:
 							printf(_("%s exists in both '%s' and '%s'\n"),