From 8ea779e59a516d96e3320aaaaf1cda987752c5e6 Mon Sep 17 00:00:00 2001 From: kibigo! Date: Sun, 25 Jun 2017 12:51:31 -0700 Subject: [PATCH] Patching rebase errors --- app/javascript/mastodon/features/getting_started/index.js | 2 +- .../mastodon/features/ui/components/onboarding_modal.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 16f71966bb..ac93b3d478 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -97,7 +97,7 @@ export default class GettingStarted extends ImmutablePureComponent { glitch-soc/mastodon, Mastodon: Mastodon}} + values={{ github: glitch-soc/mastodon, Mastodon: Mastodon }} />

diff --git a/app/javascript/mastodon/features/ui/components/onboarding_modal.js b/app/javascript/mastodon/features/ui/components/onboarding_modal.js index 1b8d844d3f..4c1c0f7c1e 100644 --- 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 }) => { ); }; -GitHub }} />

-