Resolve conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/controllers/snippets_controller.rb

@@ -62,10 +62,14 @@ class SnippetsController < ApplicationController
   end
 
   def show
-<<<<<<< HEAD
     blob = @snippet.blob
     override_max_blob_size(blob)
 
+    @noteable = @snippet
+
+    @discussions = @snippet.discussions
+    @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes))
+
     respond_to do |format|
       format.html do
         render 'show'
@@ -75,12 +79,6 @@ class SnippetsController < ApplicationController
         render_blob_json(blob)
       end
     end
-=======
-    @noteable = @snippet
-
-    @discussions = @snippet.discussions
-    @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes))
->>>>>>> origin/master
   end
 
   def destroy

app/views/shared/notes/_note.html.haml

@@ -35,8 +35,7 @@
               = render 'projects/notes/actions', note: note, note_editable: note_editable
       .note-body{ class: note_editable ? 'js-task-list-container' : '' }
         .note-text.md
-          = preserve do
-            = note.redacted_note_html
+          = note.redacted_note_html
 
         = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
         - if note_editable

db/schema.rb

@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(version: 20170426181740) do
-=======
 ActiveRecord::Schema.define(version: 20170427180205) do
->>>>>>> origin/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

lib/gitlab/git/repository.rb

@@ -1261,17 +1261,16 @@ module Gitlab
         @gitaly_ref_client ||= Gitlab::GitalyClient::Ref.new(self)
       end
 
-<<<<<<< HEAD
       def gitaly_commit_client
         @gitaly_commit_client ||= Gitlab::GitalyClient::Commit.new(self)
-=======
+      end
+
       def gitaly_migrate(method, &block)
         Gitlab::GitalyClient.migrate(method, &block)
       rescue GRPC::NotFound => e
         raise NoRepository.new(e)
       rescue GRPC::BadStatus => e
         raise CommandError.new(e)
->>>>>>> origin/master
       end
 
       # Returns the `Rugged` sorting type constant for a given