Resolve conflict in app/controllers/profiles_controller.rb

209762fc · Imre Farkas · 2e5ae2d4 · 209762fc
Commit 209762fc authored Jun 01, 2018 by Imre Farkas
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/controllers/profiles_controller.rb app/controllers/profiles_controller.rb +0 -4

No files found.
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -39,11 +39,7 @@ class ProfilesController < Profiles::ApplicationController
      user.reset_feed_token!
    end

-<<<<<<< HEAD
-    flash[:notice] = "Feed token was successfully reset"
-=======
    flash[:notice] = 'Feed token was successfully reset'
->>>>>>> upstream/master

    redirect_to profile_personal_access_tokens_path
  end