Patching rebase errors

2017-06-25 12:51:31 -07:00 · 2017-06-25 12:51:31 -07:00 · 8ea779e59a
parent 7eda83a36a
commit 8ea779e59a
2 changed files with 2 additions and 3 deletions
--- a/app/javascript/mastodon/features/ui/components/onboarding_modal.js
+++ b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
@ -155,8 +155,7 @@ const PageSix = ({ admin, domain }) => {
    </div>
  );
 };
-<a href='https://github.com/glitch-soc/mastodon' target='_blank' rel='noopener'>GitHub</a> }} /></p>
-      <p><FormattedMessage id='onboarding.page_six.apps_available' defaultMessage='There are {apps} available for iOS, Android and other platforms.' values={{ apps: <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mast
+
 PageSix.propTypes = {
  admin: ImmutablePropTypes.map,
  domain: PropTypes.string.isRequired,