Browse files

Merge from stefan

  • Loading branch information...
2 parents 1ebaa01 + 7e6216e commit ab1f8ffcae391b6d9c388b4ee799bad6087d0be7 Rich Daley committed Jul 28, 2012
Showing with 11 additions and 0 deletions.
  1. +6 −0 .gitignore
  2. +3 −0 dotcloud.yml
  3. +2 −0 generator/generator.py
View
6 .gitignore
@@ -50,6 +50,7 @@ db/*.sqlite3
/specifications
rerun.txt
pickle-email-*.html
+<<<<<<< HEAD
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
@@ -76,3 +77,8 @@ pickle-email-*.html
**.swp
*~
+# VirtualEnv
+bin/
+include/
+lib/
+local/
View
3 dotcloud.yml
@@ -0,0 +1,3 @@
+worker:
+ approot: generator
+ type: python-worker
View
2 generator/generator.py
@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+print 'hello world'

0 comments on commit ab1f8ff

Please sign in to comment.