Permalink
Browse files

Don't ignore Rackup file

  • Loading branch information...
1 parent 8a5bfd2 commit 5085fdaf9e0d8f44ff524089878bdf3f7a231f42 @kwiest committed Feb 13, 2012
Showing with 4 additions and 5 deletions.
  1. +0 −5 .gitignore
  2. +4 −0 config.ru
View
@@ -12,8 +12,3 @@ db/*.sqlite3
.powenv
.powrc
.bundle
-
-<<<<<<< HEAD:.gitignore
-=======
-config.ru
->>>>>>> heroku:.gitignore
View
@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to star tthe application.
+
+require ::File.expand_path('../config/environment', __FILE__)
+run TeacherDucklings::Application

0 comments on commit 5085fda

Please sign in to comment.