Resolved conflicts in app/models/personal_snippet.rb

91651bb7 · Mario de la Ossa · 02e808bf · 91651bb7
Commit 91651bb7 authored Jun 05, 2018 by Mario de la Ossa
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/personal_snippet.rb app/models/personal_snippet.rb +0 -3

No files found.
--- a/app/models/personal_snippet.rb
+++ b/app/models/personal_snippet.rb
 class PersonalSnippet < Snippet
-<<<<<<< HEAD
  # Elastic search configuration (it does not support STI)
  document_type 'snippet'
  index_name [Rails.application.class.parent_name.downcase, Rails.env].join('-')
  include Elastic::SnippetsSearch
-=======
->>>>>>> upstream/master
  include WithUploads
 end