merge conflict

LiuN1an · LiuN1an · commit 7b58a6a796e2 · 2022-05-11T23:45:07.000+08:00
diff --git a/basic/06-ethersjs-waffle/README-cn.md b/basic/06-ethersjs-waffle/README-cn.md
@@ -1,3 +1,5 @@
+[English](https://github.com/Dapp-Learning-DAO/Dapp-Learning/main/basic/06-ethersjs-waffle/README.md)
+
 ## 前言
 
 Waffle 是一款适配 ehter.js 的智能合约测试库。本样例演示了使用 Waffle 进行测试的基本流程及使用方法.  
diff --git a/basic/06-ethersjs-waffle/README.md b/basic/06-ethersjs-waffle/README.md
@@ -1,3 +1,5 @@
+[中文](https://github.com/Dapp-Learning-DAO/Dapp-Learning/main/basic/06-ethersjs-waffle/README-CN.md)
+
 ## Preface
 
 Waffle is a smart contract test library that adapts to ehter.js. This example demonstrates the basic process and usage of Waffle test.

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+[English](https://github.com/Dapp-Learning-DAO/Dapp-Learning/main/basic/06-ethersjs-waffle/README.md)`
	`2`	`+`
`1`	`3`	`## 前言`
`2`	`4`
`3`	`5`	`Waffle 是一款适配 ehter.js 的智能合约测试库。本样例演示了使用 Waffle 进行测试的基本流程及使用方法.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+[中文](https://github.com/Dapp-Learning-DAO/Dapp-Learning/main/basic/06-ethersjs-waffle/README-CN.md)`
	`2`	`+`
`1`	`3`	`## Preface`
`2`	`4`
`3`	`5`	`Waffle is a smart contract test library that adapts to ehter.js. This example demonstrates the basic process and usage of Waffle test.`