From c99f5ced8521412483c520f92845172c800f49d4 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Fri, 21 May 2010 17:02:14 +0200
Subject: merge conflict resolved

---
 application.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/application.rb b/application.rb
index 332c6be..c242903 100644
--- a/application.rb
+++ b/application.rb
@@ -1,12 +1,6 @@
 require 'rubygems'
-<<<<<<< HEAD:application.rb
-gem 'opentox-ruby-api-wrapper', '= 1.5.3'
-require 'opentox-ruby-api-wrapper'
-
-=======
 gem 'opentox-ruby-api-wrapper', '= 1.5.4'
 require 'opentox-ruby-api-wrapper'
->>>>>>> development:application.rb
 
 LOGGER.progname = File.expand_path(__FILE__)
 
-- 
cgit v1.2.3