Permalink
Browse files

Merge branch 'master' of github.com:eleddy/flask-noiselist

  • Loading branch information...
eleddy committed Jan 11, 2012
2 parents 672a8bc + a6c76de commit 8519ed048fcdc7930ba074494213cfc0b69778e3
Showing with 17 additions and 0 deletions.
  1. +9 −0 src/noiselist/__init__.py
  2. +8 −0 src/noiselist/script.py
@@ -1,6 +1,9 @@
# -*- coding: utf-8 -*-
from flask import Flask, request
+<<<<<<< HEAD
from flask import render_template
+=======
+>>>>>>> 469946adad19506bca2be4345498bafb71111de0
class _DefaultSettings(object):
@@ -22,5 +25,11 @@ 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,7 +51,11 @@ 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
@@ -126,4 +130,8 @@ 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 8519ed0

Please sign in to comment.