Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

config.ru

  • Loading branch information...
commit 2bd7b7c9e3b8fc205b97875d93ef2e929fb72189 1 parent 16c8f84
@kyanny kyanny authored
Showing with 0 additions and 13 deletions.
  1. +0 −13 config.ru
View
13 config.ru
@@ -1,17 +1,4 @@
-<<<<<<< HEAD
-require 'rack'
-class App
- def call(env)
- [200, {'Content-Type' => 'text/plain'}, ['hello world']]
- end
-end
-
-run App.new
-
-#a##
-=======
# This file is used by Rack-based servers to start the application.
require ::File.expand_path('../config/environment', __FILE__)
run Poison::Application
->>>>>>> github/master
Please sign in to comment.
Something went wrong with that request. Please try again.