Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 8519ed048fcdc7930ba074494213cfc0b69778e3 2 parents 672a8bc + a6c76de
Elizabeth Leddy authored January 11, 2012
9  src/noiselist/__init__.py
... ...
@@ -1,6 +1,9 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 from flask import Flask, request
  3
+<<<<<<< HEAD
3 4
 from flask import render_template
  5
+=======
  6
+>>>>>>> 469946adad19506bca2be4345498bafb71111de0
4 7
 
5 8
 
6 9
 class _DefaultSettings(object):
@@ -22,5 +25,11 @@ def init_db():
22 25
 
23 26
 @app.route('/')
24 27
 def index():
  28
+<<<<<<< HEAD
25 29
     return render_template('hello.html')
26 30
     
  31
+=======
  32
+    if request.args:
  33
+        BREAK (with_NameError)
  34
+    return 'Hello %s!' % app.config['USERNAME'].title()
  35
+>>>>>>> 469946adad19506bca2be4345498bafb71111de0
8  src/noiselist/script.py
@@ -51,7 +51,11 @@ def make_shell():
51 51
 
52 52
 def _init_db(debug=False, dry_run=False):
53 53
     """Initialize the database."""
  54
+<<<<<<< HEAD
54 55
     from noiselist import init_db
  56
+=======
  57
+    from hello import init_db
  58
+>>>>>>> 469946adad19506bca2be4345498bafb71111de0
55 59
     print 'init_db()'
56 60
     if dry_run:
57 61
         return
@@ -126,4 +130,8 @@ def action_status(dry_run=False):
126 130
     def action_stop(dry_run=False):
127 131
         """Stop the application."""
128 132
         _serve('stop', dry_run=dry_run)
  133
+<<<<<<< HEAD
  134
+=======
  135
+
  136
+>>>>>>> 469946adad19506bca2be4345498bafb71111de0
129 137
     werkzeug.script.run()

0 notes on commit 8519ed0

Please sign in to comment.
Something went wrong with that request. Please try again.