fixes

benwbrum · Oct 20, 2022 · fa6b500 · fa6b500
1 parent 307433f
commit fa6b500
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/app/views/devise/registrations/new.html.slim b/app/views/devise/registrations/new.html.slim
@@ -1,15 +1,11 @@
 -content_for :page_title, t('devise.sign_up')
 
 section.signon
-<<<<<<< HEAD
-  h1 Sign Up
+  h1= t('devise.sign_up')
 
   p Please fill in the following information to create a new FromThePage account. 
   p By registering with this website you certify that you are at least 13 years of age or have parental permission.
 
-=======
-  h1= t('devise.sign_up')
->>>>>>> development
   =form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
     =devise_error_messages!
     .signon_field

diff --git a/app/views/devise/sessions/new.html.slim b/app/views/devise/sessions/new.html.slim
@@ -38,12 +38,6 @@ section.signon
 
     = link_to t('.sign_up_now'), new_user_registration_path, class: 'button big'
 
-  section#free_trial.signup-links
-    h2= t('.start_free_trial')
-    p= t('.start_free_trial_message')
-
-    =link_to t('.start_free_trial'), users_new_trial_path, class: 'button big'
-
   hr.clearfix
 
 -unless MIXPANEL_ID.blank?