Merge branch 'public-structs'

1 files changed, 0 insertions, 13 deletions

diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h
index 7a3784a2..546a2820 100644
--- a/lib/libalpm/conflict.h
+++ b/lib/libalpm/conflict.h
@@ -24,19 +24,6 @@
 #include "db.h"
 #include "package.h"
 
-struct __pmconflict_t {
-	char *package1;
-	char *package2;
-	char *reason;
-};
-
-struct __pmfileconflict_t {
-	char *target;
-	pmfileconflicttype_t type;
-	char *file;
-	char *ctarget;
-};
-
 pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict);
 void _alpm_conflict_free(pmconflict_t *conflict);
 alpm_list_t *_alpm_innerconflicts(pmhandle_t *handle, alpm_list_t *packages);