gatsby-ru icon indicating copy to clipboard operation
gatsby-ru copied to clipboard

(sync) Resolve conflicts with gatsby-i18n-source @ 90932a0

Open gatsbybot opened this issue 4 years ago • 0 comments

Sync conflicts with the source repo. Please update the translations based on updated source content.

For more information on how to resolve sync conflicts, check out the guide for syncing translations.

The following 23 files have conflicts:
  • [x] docs/tutorial/wordpress-source-plugin-tutorial.md
  • [x] docs/tutorial/using-a-theme.md
  • [x] docs/docs/using-graphql-playground.md
  • [x] docs/docs/upgrading-node-js.md
  • [x] docs/docs/typography-js.md
  • [x] docs/docs/sourcing-from-buttercms.md
  • [ ] docs/docs/quick-start.md
  • [x] docs/docs/preparing-your-environment.md
  • [x] docs/docs/path-prefix.md
  • [x] docs/docs/mdx/programmatically-creating-pages.md
  • [ ] docs/docs/index.md
  • [x] docs/docs/how-shadowing-works.md
  • [x] docs/docs/gatsby-lifecycle-apis.md
  • [ ] docs/docs/gatsby-cli.md
  • [x] docs/docs/bulma.md
  • [x] docs/docs/building-an-e-commerce-site.md
  • [x] docs/docs/browser-support.md
  • [x] docs/docs/babel.md
  • [x] docs/docs/audit-with-lighthouse.md
  • [x] docs/docs/adding-search-with-elasticlunr.md
  • [x] docs/docs/add-custom-webpack-config.md
  • [x] docs/docs/add-404-page.md
  • [x] docs/contributing/organize-a-gatsby-event.md

Once all the commits have been fixed, mark this pull request as "Ready for review" and merge it in!

See all changes since the last sync here:

https://github.com/gatsbyjs/gatsby-i18n-source/compare/d7eb748..90932a0

NOTE: Do NOT squash-merge this pull request. The sync script requires a ref to the source repo in order to work correctly.

Related PRs

#37 PR for syncing non-conflicting files

gatsbybot avatar Feb 19 '20 21:02 gatsbybot