Resolve conflicts

This commit is contained in:
GrayLand 2017-09-01 09:11:42 +08:00
parent 459095b917
commit 0487bd9566

View File

@ -3,10 +3,6 @@
<img src="https://i.imgur.com/bYwl7Vf.png" alt="Learn Regex"> <img src="https://i.imgur.com/bYwl7Vf.png" alt="Learn Regex">
</p><br/> </p><br/>
<<<<<<< HEAD
[中文版](README-zh-simple.md)
=======
## Translations: ## Translations:
* [English](README.md) * [English](README.md)
@ -15,12 +11,8 @@
* [Português do Brasil](README-pt_BR.md) * [Português do Brasil](README-pt_BR.md)
* [中文版](README-cn.md) * [中文版](README-cn.md)
* [日本語](README-ja.md) * [日本語](README-ja.md)
<<<<<<< HEAD
>>>>>>> zeeshanu/master
=======
* [한국어](README-ko.md) * [한국어](README-ko.md)
* [Turkish](README-tr.md) * [Turkish](README-tr.md)
>>>>>>> zeeshanu/master
## What is Regular Expression? ## What is Regular Expression?