Merge conflicts were resolved

.gitignore

@@ -5,16 +5,9 @@
 /InstalledFiles
 /pkg/
 /spec/reports/
-<<<<<<< HEAD
 test/*
 tmp/*
 .idea/*
-=======
-/test/tmp/
-/test/version_tmp/
-/tmp/
-/.idea/
->>>>>>> 0c5ddec6aab31a0e2641dd2f1c7fc71b913a82b9
 
 ## Specific to RubyMotion:
 .dat*
@@ -54,13 +47,5 @@ build/
 /log/
 /tmp
 *.log
-<<<<<<< HEAD
 config/environment.yml
 config/mongoid.yml
-=======
-test.html.haml
-
-config/environments/development.rb
-config/environments/test.rb
-config/environments/production.rb
->>>>>>> 0c5ddec6aab31a0e2641dd2f1c7fc71b913a82b9

Gemfile

@@ -98,9 +98,5 @@ gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
 gem 'mini_magick'
 gem 'redis-rails'
 gem 'redis-namespace'
-<<<<<<< HEAD
 gem 'mina'
-=======
-gem 'pry'
->>>>>>> 0c5ddec6aab31a0e2641dd2f1c7fc71b913a82b9
 gem 'rest_client'

Gemfile.lock

@@ -60,10 +60,7 @@ GEM
       mongoid-grid_fs (>= 1.3, < 3.0)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-<<<<<<< HEAD
-=======
     coderay (1.1.0)
->>>>>>> 0c5ddec6aab31a0e2641dd2f1c7fc71b913a82b9
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -136,15 +133,12 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-<<<<<<< HEAD
     mime-types (1.25.1)
     mina (0.3.0)
       open4
       rake
-=======
     method_source (0.8.2)
     mime-types (1.25.1)
->>>>>>> 0c5ddec6aab31a0e2641dd2f1c7fc71b913a82b9
     mini_magick (3.7.0)
       subexec (~> 0.2.1)
     mini_portile (0.6.0)
@@ -185,21 +179,15 @@ GEM
       multi_json (~> 1.3)
       oauth2 (~> 0.9.3)
       omniauth (~> 1.2)
-<<<<<<< HEAD
     open4 (1.3.4)
-=======
->>>>>>> 0c5ddec6aab31a0e2641dd2f1c7fc71b913a82b9
     optionable (0.2.0)
     origin (2.1.1)
     orm_adapter (0.5.0)
     polyglot (0.3.5)
-<<<<<<< HEAD
-=======
     pry (0.10.0)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
->>>>>>> 0c5ddec6aab31a0e2641dd2f1c7fc71b913a82b9
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -295,10 +283,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-<<<<<<< HEAD
-=======
     slop (3.5.0)
->>>>>>> 0c5ddec6aab31a0e2641dd2f1c7fc71b913a82b9
     spring (1.1.3)
     sprockets (2.11.0)
       hike (~> 1.2)
@@ -356,17 +341,10 @@ DEPENDENCIES
   jbuilder (~> 2.0)
   jquery-rails
   linkedin
-<<<<<<< HEAD
   mina
   mini_magick
   mongoid
   omniauth-google-oauth2
-=======
-  mini_magick
-  mongoid
-  omniauth-google-oauth2
-  pry
->>>>>>> 0c5ddec6aab31a0e2641dd2f1c7fc71b913a82b9
   rails (= 4.1.2)
   redactor-rails
   redis-namespace

config/application.rb

@@ -29,16 +29,12 @@ class Application < Rails::Application
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
     config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
-<<<<<<< HEAD
-
     config.before_configuration do
       env_file = File.join(Rails.root, 'config', 'environment.yml')
       YAML.load(File.open(env_file)).each do |key, value|
         ENV[key.to_s] = value
       end if File.exist?(env_file)
     end
-=======
->>>>>>> 0c5ddec6aab31a0e2641dd2f1c7fc71b913a82b9
     #config.cache_store = :redis_store, 'redis://localhost:6379/0/cache', { expires_in: 90.minutes }
   end
 end