Fixed coding styles

1cf7b5ac · Đường Sỹ Hoàng · 183850cf · 1cf7b5ac · 183850cf · 1cf7b5ac
Commit 1cf7b5ac authored Nov 22, 2019 by Đường Sỹ Hoàng
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

app/controllers/users_controller.rb
+0 -0

app/helpers/relationships_helper.rb
+0 -2

app/models/user.rb
+0 -0

app/views/users/edit.html.erb
+4 -0

No files found.
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
--- a/app/helpers/relationships_helper.rb
+++ b/app/helpers/relationships_helper.rb
-module RelationshipsHelper
-end
--- a/app/models/user.rb
+++ b/app/models/user.rb
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -6,12 +6,16 @@
 <div class="row">
  <div class="col-md-6 col-md-offset-3">
 <<<<<<< HEAD
+<<<<<<< HEAD
    <%= render "form" %>
    <div class="gravatar_edit">
      <%= gravatar_for @user %>
      <a href="http://gravatar.com/emails">change</a>
 =======
    <%= render  "form" %>
+=======
+    <%= render "form" %>
+>>>>>>> Fixed coding styles
  <div class="gravatar_edit">
    <%= gravatar_for @user %>
    <a href="http://gravatar.com/emails">change</a>