Resolve conflicts in app/controllers/admin/dashboard_controller.rb

b9a6c977 · Stan Hu · 66ed9365 · b9a6c977
Commit b9a6c977 authored May 16, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/controllers/admin/dashboard_controller.rb app/controllers/admin/dashboard_controller.rb +0 -3

No files found.
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
 class Admin::DashboardController < Admin::ApplicationController
-<<<<<<< HEAD
  prepend ::EE::Admin::DashboardController

-=======
->>>>>>> upstream/master
  include CountHelper

  def index