fix merge conflit

Leandro Santos
1 parent c33143c8
Showing 1 changed file with 0 additions and 10 deletions Show diff stats
app/models/profile.rb
@@ -306,16 +306,6 @@ class Profile &lt; ApplicationRecord
     scrap.nil? ? Scrap.all_scraps(self) : Scrap.all_scraps(self).find(scrap)
   end
  
-<<<<<<< HEAD
-  settings_items :redirect_l10n, :type => :boolean, :default => false
-  settings_items :public_content, :type => :boolean, :default => true
-  settings_items :description
-  settings_items :fields_privacy, :type => :hash, :default => {}
-  settings_items :email_suggestions, :type => :boolean, :default => false
-  settings_items :profile_admin_mail_notification, :type => :boolean, :default => true
-
-=======
->>>>>>> master
   validates_length_of :description, :maximum => 550, :allow_nil => true
  
   # Valid identifiers must match this format.
...	...	@@ -306,16 +306,6 @@ class Profile < ApplicationRecord
306	306	scrap.nil? ? Scrap.all_scraps(self) : Scrap.all_scraps(self).find(scrap)
307	307	end
308	308
309		-<<<<<<< HEAD
310		- settings_items :redirect_l10n, :type => :boolean, :default => false
311		- settings_items :public_content, :type => :boolean, :default => true
312		- settings_items :description
313		- settings_items :fields_privacy, :type => :hash, :default => {}
314		- settings_items :email_suggestions, :type => :boolean, :default => false
315		- settings_items :profile_admin_mail_notification, :type => :boolean, :default => true
316		-
317		-=======
318		->>>>>>> master
319	309	validates_length_of :description, :maximum => 550, :allow_nil => true
320	310
321	311	# Valid identifiers must match this format.
...	...