From 1608dc29b5b567f7daef5a5842601db84fd3c129 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.de>
Date: Thu, 29 Dec 2011 14:45:54 +0100
Subject: [PATCH] merge cleanup

---
 tools/findfileconflicts.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/findfileconflicts.c b/tools/findfileconflicts.c
index c078ed2..596438c 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;
-- 
2.7.4