merge conflicts

Pearlception/app/controllers/dashboard_controller.rb

@@ -2,9 +2,6 @@ class DashboardController < ApplicationController
     before_filter :deny_to_visitors
 
     def index
-<<<<<<< HEAD
-        @results = Result.page(params[:page]).per(5)
-=======
       #This is a temporary fix until runs and results models are properly discussed with bobby
         #@results = Result.page(params[:page]).per(5)
         if current_user.admin?
@@ -29,7 +26,6 @@ class DashboardController < ApplicationController
           @results = Run.page(params[:page]).per(5)
         end
 
->>>>>>> 66dfc7d12c7a612332c9b8de8f32df39a0d362ce
     end
 
     def deny_to_visitors

Pearlception/config/database.yml

@@ -31,13 +31,8 @@ stats_test:
 development:
   <<: *default
   database: Pearlception_development
-<<<<<<< HEAD
-  username: <%= ENV['DEV_DB_USER']%> 
-  password: <%= ENV['DEV_DB_PASS']%>
-=======
   username: bmv 
   password: 1156244terps!
->>>>>>> 66dfc7d12c7a612332c9b8de8f32df39a0d362ce
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -45,13 +40,8 @@ development:
 test:
   <<: *default
   database: Pearlception_test
-<<<<<<< HEAD
-  username: <%= ENV['DEV_DB_USER']%> 
-  password: <%= ENV['DEV_DB_PASS']%>
-=======
   username: bmv 
   password: 1156244terps!
->>>>>>> 66dfc7d12c7a612332c9b8de8f32df39a0d362ce
 
 # As with config/secrets.yml, you never want to store sensitive information,
 # like your database password, in your source code. If your source code is