merge hates me today

noisebridge · Jan 11, 2012 · 784756e · 784756e
1 parent 8519ed0
commit 784756e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 18 deletions.
diff --git a/src/noiselist/__init__.py b/src/noiselist/__init__.py
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 from flask import Flask, request
-<<<<<<< HEAD
 from flask import render_template
-=======
->>>>>>> 469946adad19506bca2be4345498bafb71111de0
-
 
 class _DefaultSettings(object):
     USERNAME = 'world'
@@ -25,11 +21,5 @@ def init_db():
 
 @app.route('/')
 def index():
-<<<<<<< HEAD
     return render_template('hello.html')
 
-=======
-    if request.args:
-        BREAK (with_NameError)
-    return 'Hello %s!' % app.config['USERNAME'].title()
->>>>>>> 469946adad19506bca2be4345498bafb71111de0
diff --git a/src/noiselist/script.py b/src/noiselist/script.py
@@ -51,11 +51,7 @@ def make_shell():
 
 def _init_db(debug=False, dry_run=False):
     """Initialize the database."""
-<<<<<<< HEAD
     from noiselist import init_db
-=======
-    from hello import init_db
->>>>>>> 469946adad19506bca2be4345498bafb71111de0
     print 'init_db()'
     if dry_run:
         return
@@ -130,8 +126,4 @@ def action_status(dry_run=False):
     def action_stop(dry_run=False):
         """Stop the application."""
         _serve('stop', dry_run=dry_run)
-<<<<<<< HEAD
-=======
-
->>>>>>> 469946adad19506bca2be4345498bafb71111de0
     werkzeug.script.run()