more merges

Rakefile

@@ -1,20 +1,7 @@
-<<<<<<< HEAD
 #!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
 
 Classie::Application.load_tasks
-=======
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
-
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-require 'tasks/rails'
->>>>>>> d4a4f1bcc942c20df1b86ac333158c9e7d25fbed

app/helpers/application_helper.rb

@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-=======
-# Methods added to this helper will be available to all templates in the application.
->>>>>>> d4a4f1bcc942c20df1b86ac333158c9e7d25fbed
 module ApplicationHelper
 end

config/initializers/backtrace_silencers.rb

@@ -3,10 +3,5 @@
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
 # Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
 
-<<<<<<< HEAD
 # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
 # Rails.backtrace_cleaner.remove_silencers!
-=======
-# You can also remove all the silencers if you're trying do debug a problem that might steem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
->>>>>>> d4a4f1bcc942c20df1b86ac333158c9e7d25fbed

config/initializers/inflections.rb

@@ -1,22 +1,15 @@
 # Be sure to restart your server when you modify this file.
 
-<<<<<<< HEAD
 # Add new inflection rules using the following format
-=======
-# Add new inflection rules using the following format 
->>>>>>> d4a4f1bcc942c20df1b86ac333158c9e7d25fbed
 # (all these examples are active by default):
 # ActiveSupport::Inflector.inflections do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
-<<<<<<< HEAD
 #
 # These inflection rules are supported but not enabled by default:
 # ActiveSupport::Inflector.inflections do |inflect|
 #   inflect.acronym 'RESTful'
 # end
-=======
->>>>>>> d4a4f1bcc942c20df1b86ac333158c9e7d25fbed

config/initializers/session_store.rb

@@ -1,24 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-<<<<<<< HEAD
 Classie::Application.config.session_store :cookie_store, key: '_classie_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
 # (create the session table with "rails generate session_migration")
 # Classie::Application.config.session_store :active_record_store
-=======
-# Your secret key for verifying cookie session data integrity.
-# If you change this key, all old sessions will become invalid!
-# Make sure the secret is at least 30 characters and all random, 
-# no regular words or you'll be exposed to dictionary attacks.
-ActionController::Base.session = {
-  :key         => '_classifieds_session',
-  :secret      => 'bc161f62c2b5727ade478b316e108844df2316f68cb4490dfe88e650ac249fa4b614fcd9798091cc99475bb3deb8c7806056f324c40396b7e268872384c07e2d'
-}
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rake db:sessions:create")
-# ActionController::Base.session_store = :active_record_store
->>>>>>> d4a4f1bcc942c20df1b86ac333158c9e7d25fbed