From 3bf7a4b54385a2f3765a85c0bae23190169f5c0a Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Tue, 2 Jun 2015 08:50:17 +0200
Subject: Fixex bad merge

---
 Program.cs | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/Program.cs b/Program.cs
index dfd3800..da197b2 100644
--- a/Program.cs
+++ b/Program.cs
@@ -94,25 +94,20 @@ namespace Ildasm
 						}
                         else if (IsIldasmOption(arg, "project"))
                         {
-                        flags |= Flags.Project;
-<<<<<<< HEAD
+                            flags |= Flags.Project;
+                        }
                     }
                     else
                     {
-                        PrintUsage();
-                        return;
-                    }
-                }
-                else
-                {
-                    if (inputFile != null)
-                    {
-                        PrintUsage();
-                        return;
-                    }
-                    else
-                    {
-                        inputFile = arg;
+                        if (inputFile != null)
+                        {
+                            PrintUsage();
+                            return 1;
+                        }
+                        else
+                        {
+                            inputFile = arg;
+                        }
                     }
                 }
             }
-- 
cgit v1.2.3