fixes merge

celery/apps/worker.py

@@ -67,31 +67,20 @@ ARTLINES = [
 BANNER = """\
 {hostname} v{version}
 
-<<<<<<< HEAD
-[Configuration]
-. broker:      {conninfo}
-. app:         {app}
-. concurrency: {concurrency}
-. events:      {events}
-
-[Queues]
-{queues}
-=======
-%(platform)s
+{platform}
 
 [config]
-.> broker:      %(conninfo)s
-.> app:         %(app)s
-.> concurrency: %(concurrency)s
-.> events:      %(events)s
+.> broker:      {conninfo}
+.> app:         {app}
+.> concurrency: {concurrency}
+.> events:      {events}
 
 [queues]
-%(queues)s
->>>>>>> 3.0
+{queues}
 """
 
 EXTRA_INFO_FMT = """
-[Tasks]
+[tasks]
 {tasks}
 """
 

celery/bin/celery.py

@@ -683,7 +683,8 @@ class CeleryCommand(Command):
             return cls(app=self.app).run_from_argv(
                 self.prog_name, argv[1:], command=argv[0],
             )
-        except (TypeError, Error):
+        except (TypeError, Error), exc:
+            raise
             return self.execute('help', argv)
 
     def remove_options_at_beginning(self, argv, index=0):