Removed unuse file

app/controllers/users_controller.rb

@@ -9,13 +9,17 @@ class UsersController < ApplicationController
 
   def show
     @user = User.find(params[:id])
+<<<<<<< HEAD
     redirect_to root_url and return unless @user.activated 
+=======
+    redirect_to root_url and return unless @user.activated
+>>>>>>> Removed unuse file
     @microposts = @user.microposts.paginate(page: params[:page]) 
   end
 
   def new
     @user = User.new 
- end
+  end
 
   def create
     @user = User.new(user_params)  

app/models/micropost.rb

@@ -4,8 +4,7 @@ class Micropost < ApplicationRecord
   mount_uploader :picture, PictureUploader
 
   belongs_to :user
-  
-  
+
   validates :user_id, presence: true
   validates :content, presence: true, length: { maximum: 140 }
   validate :picture_size

app/models/user.rb

@@ -24,7 +24,7 @@ class User < ApplicationRecord
   has_secure_password
 
   class << self
-     # Returns the hash digest of the given string. 
+    # Returns the hash digest of the given string. 
     def digest(string)
       cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST : BCrypt::Engine.cost
       BCrypt::Password.create(string, cost: cost)

app/views/users/edit.html.erb

@@ -5,10 +5,17 @@
 
 <div class="row">
   <div class="col-md-6 col-md-offset-3">
+<<<<<<< HEAD
     <%= render "form" %>
     <div class="gravatar_edit">
       <%= gravatar_for @user %>
       <a href="http://gravatar.com/emails">change</a>
+=======
+    <%= render  "form" %>
+  <div class="gravatar_edit">
+    <%= gravatar_for @user %>
+    <a href="http://gravatar.com/emails">change</a>
+>>>>>>> Removed unuse file
     </div>
   </div>
 </div>