Fixex bad merge

1 files 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;
+                        }
                     }
                 }
             }