From 6d006ccc331cacb636eb43373e237c38b37d3c09 Mon Sep 17 00:00:00 2001
From: "Kent C. Dodds" <kent+github@doddsfamily.us>
Date: Thu, 6 Jun 2019 14:51:27 -0600
Subject: [PATCH 1/3] Update React Testing Library name (#2061)

Since the package was renamed to `@testing-library/react` we're trying to encourage people to drop writing "react-testing-library" in favor of "React Testing Library"
---
 content/docs/addons-test-utils.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/docs/addons-test-utils.md b/content/docs/addons-test-utils.md
index 6cf2af081..2eb9f3b33 100644
--- a/content/docs/addons-test-utils.md
+++ b/content/docs/addons-test-utils.md
@@ -19,7 +19,7 @@ var ReactTestUtils = require('react-dom/test-utils'); // ES5 with npm
 
 > Note:
 >
-> We recommend using [`react-testing-library`](https://git.io/react-testing-library) which is designed to enable and encourage writing tests that use your components as the end users do.
+> We recommend using [React Testing Library](https://testing-library.com/react) which is designed to enable and encourage writing tests that use your components as the end users do.
 >
 > Alternatively, Airbnb has released a testing utility called [Enzyme](https://airbnb.io/enzyme/), which makes it easy to assert, manipulate, and traverse your React Components' output.
 

From 2d9c2785dd9bd1d2876dd2c5b1e3bc233b115f3e Mon Sep 17 00:00:00 2001
From: Taehwan Noh <taehwanno.dev@gmail.com>
Date: Fri, 7 Jun 2019 22:48:12 +0900
Subject: [PATCH 2/3] Update languages for Korean completion

---
 content/languages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/languages.yml b/content/languages.yml
index 3919bb503..268515d7a 100644
--- a/content/languages.yml
+++ b/content/languages.yml
@@ -90,7 +90,7 @@
 - name: Korean
   translated_name: 한국어
   code: ko
-  status: 1
+  status: 2
 - name: Kurdish
   translated_name: کوردی‎
   code: ku

From eb031a16b7739b1392b07c1279b9c5cc2ecd9f38 Mon Sep 17 00:00:00 2001
From: jakubdrozdek <30927218+jakubdrozdek@users.noreply.github.com>
Date: Sun, 9 Jun 2019 02:27:43 +0200
Subject: [PATCH 3/3] Apply suggestions from code review

---
 content/docs/addons-test-utils.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/content/docs/addons-test-utils.md b/content/docs/addons-test-utils.md
index 5a32ad49b..22903c6ab 100644
--- a/content/docs/addons-test-utils.md
+++ b/content/docs/addons-test-utils.md
@@ -19,11 +19,7 @@ var ReactTestUtils = require('react-dom/test-utils'); // ES5 z zainstalowanym np
 
 > Uwaga:
 >
-<<<<<<< HEAD
-> Zalecamy korzystanie z biblioteki [`react-testing-library`](https://git.io/react-testing-library). Została ona stworzona w celu propagowania idei pisania testów, które używają komponentów podobnie jak potencjalny użytkownik aplikacji.
-=======
-> We recommend using [React Testing Library](https://testing-library.com/react) which is designed to enable and encourage writing tests that use your components as the end users do.
->>>>>>> 2d9c2785dd9bd1d2876dd2c5b1e3bc233b115f3e
+> Zalecamy korzystanie z biblioteki [React Testing Library](https://testing-library.com/react). Została ona stworzona w celu propagowania idei pisania testów, które używają komponentów podobnie jak potencjalny użytkownik aplikacji.
 >
 > Jako alternatywę, firma Airbnb opublikowała narzędzie do testowania o nazwie [Enzyme](https://airbnb.io/enzyme/), które pozwala na łatwe pisanie asercji, a także manipulowanie i przechodzenie drzewa zwróconego przez komponenty reactowe.