re

Cysharp · Jun 15, 2020 · edf3249 · edf3249
1 parent 785f583
commit edf3249
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -781,11 +781,7 @@ After Unity 2019.3.4f1, Unity 2020.1a21, that support path query parameter of gi
 
 or add `"com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask"` to `Packages/manifest.json`.
 
-<<<<<<< HEAD
 If you want to set a target version, UniTask is using `*.*.*` release tag so you can specify a version like `#2.0.18`. For example `https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask#2.0.18`.
-=======
-If you want to set a target version, UniTask is using `*.*.*` release tag so you can specify a version like `#2.0.17`. For example `https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask#2.0.17`.
->>>>>>> master
 
 ### Install via OpenUPM