Fix conflict in app/uploaders/personal_file_uploader.rb

05a2a62e · Clement Ho · 18470a38 · 05a2a62e
Commit 05a2a62e authored Feb 22, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 9 deletions

app/uploaders/personal_file_uploader.rb app/uploaders/personal_file_uploader.rb +0 -9

No files found.
--- a/app/uploaders/personal_file_uploader.rb
+++ b/app/uploaders/personal_file_uploader.rb
@@ -20,15 +20,6 @@ class PersonalFileUploader < FileUploader
    true
  end

-<<<<<<< HEAD
-  def object_store
-    return Store::LOCAL unless model
-
-    super
-  end
-
-=======
->>>>>>> upstream/master
  # Revert-Override
  def store_dir
    store_dirs[object_store]