From 899411236d5b1520ab8b8e7fad7d48c681abc69b Mon Sep 17 00:00:00 2001
From: iqbal125 <iqbal125@yahoo.com>
Date: Tue, 18 Jun 2019 14:16:38 -0700
Subject: [PATCH 1/2] old link to outdated version of jest (#2088)

This link is pointing to a much older version of Jest. I have added a link to the current page for snapshot testing for the current version of jest.
---
 content/docs/reference-test-renderer.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/docs/reference-test-renderer.md b/content/docs/reference-test-renderer.md
index 3de2d5752..d53a257d4 100644
--- a/content/docs/reference-test-renderer.md
+++ b/content/docs/reference-test-renderer.md
@@ -38,7 +38,7 @@ console.log(testRenderer.toJSON());
 //   children: [ 'Facebook' ] }
 ```
 
-You can use Jest's snapshot testing feature to automatically save a copy of the JSON tree to a file and check in your tests that it hasn't changed: [Learn more about it](https://facebook.github.io/jest/blog/2016/07/27/jest-14.html).
+You can use Jest's snapshot testing feature to automatically save a copy of the JSON tree to a file and check in your tests that it hasn't changed: [Learn more about it](https://jestjs.io/docs/en/snapshot-testing).
 
 You can also traverse the output to find specific nodes and make assertions about them.
 

From b07a42cc422468b1c8500fac7d511b6aaf3da334 Mon Sep 17 00:00:00 2001
From: Taehwan Noh <taehwanno.dev@gmail.com>
Date: Thu, 20 Jun 2019 02:10:21 +0900
Subject: [PATCH 2/2] Resolve merge conflict

Related to 8994112
---
 content/docs/reference-test-renderer.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/content/docs/reference-test-renderer.md b/content/docs/reference-test-renderer.md
index 631623fa8..d34e399bb 100644
--- a/content/docs/reference-test-renderer.md
+++ b/content/docs/reference-test-renderer.md
@@ -40,11 +40,7 @@ console.log(testRenderer.toJSON());
 //   children: [ 'Facebook' ] }
 ```
 
-<<<<<<< HEAD
-Jest의 스냅샷 테스트 기능으로 JSON 트리의 복사본을 파일로 자동 저장하여 테스트 내에서 변경되지 않았는지 확인할 수 있습니다. [자세히 알아보기](https://facebook.github.io/jest/blog/2016/07/27/jest-14.html)
-=======
-You can use Jest's snapshot testing feature to automatically save a copy of the JSON tree to a file and check in your tests that it hasn't changed: [Learn more about it](https://jestjs.io/docs/en/snapshot-testing).
->>>>>>> 899411236d5b1520ab8b8e7fad7d48c681abc69b
+Jest의 스냅샷 테스트 기능으로 JSON 트리의 복사본을 파일로 자동 저장하여 테스트 내에서 변경되지 않았는지 확인할 수 있습니다. [자세히 알아보기](https://jestjs.io/docs/en/snapshot-testing)
 
 또한, 결과물을 순회하며 특정 노드를 찾아 원하는 값을 가지고 있는지 검증하는 데 사용할 수 있습니다.