Permalink
Browse files

merge hates me today

  • Loading branch information...
1 parent 8519ed0 commit 784756e551264f9a6d80f4239211a4966d6413d7 @eleddy eleddy committed Jan 11, 2012
Showing with 0 additions and 18 deletions.
  1. +0 −10 src/noiselist/__init__.py
  2. +0 −8 src/noiselist/script.py
View
@@ -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
View
@@ -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()

0 comments on commit 784756e

Please sign in to comment.