Add placeholder to linkedin link input

openfoodfoundation · Dec 14, 2018 · 36b564f · 36b564f
1 parent 83e9905
commit 36b564f
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -771,15 +771,9 @@ en:
           close_date: Close Date
         social:
           twitter_placeholder: eg. @the_prof
-<<<<<<< HEAD
           instagram_placeholder: eg. the_prof
           facebook_placeholder: eg. www.facebook.com/PageNameHere
           linkedin_placeholder: eg. www.linkedin.com/in/YourNameHere
-=======
-          instagram_placeholder: eg. @the_prof
-          facebook_placeholder: "eg. www.facebook.com/PageNameHere"
-          linkedin_placeholder: "eg. www.linkedin.com/in/YourNameHere"
->>>>>>> Add new attribute linkedin_placeholder to local yml
         stripe_connect:
           connect_with_stripe: "Connect with Stripe"
           stripe_connect_intro: "To accept payments using credit card, you will need to connect your stripe account to the Open Food Network. Use the button to the right to get started."