From: Dirk Mueller <dmueller@suse.de>
Date: Thu, 29 Dec 2011 13:45:54 +0000 (+0100)
Subject: merge cleanup
X-Git-Tag: BASE-SuSE-Code-12_2-Branch~219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1608dc29b5b567f7daef5a5842601db84fd3c129;p=thirdparty%2Flibsolv.git

merge cleanup
---

diff --git a/tools/findfileconflicts.c b/tools/findfileconflicts.c
index c078ed21..596438c1 100644
--- a/tools/findfileconflicts.c
+++ b/tools/findfileconflicts.c
@@ -1,3 +1,6 @@
+/* vim: sw=2 et
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -28,7 +31,7 @@ iterate_handle(Pool *pool, Id p, void *cbdata)
   return rpm_byrpmdbid(rpmdbid, 0, (void **)cbdata);
 }
 
-int main()
+int main(int argc, char **argv)
 {
   Pool *pool;
   Repo *installed;