Point at my own repo for lektor i18n plugin for simplified testing, resolve a missed conflict

Author: johnzhou721

BeeWare.lektorproject

@@ -82,7 +82,7 @@ locale = fa_IR
 [packages]
 lektor-github-repos = 0.1.1
 lektor-markdown-admonition = 0.3.1
-../lektor-i18n-plugin =
+git+https://github.com/johnzhou721/lektor-i18n-plugin.git@patch-2 =
 
 [servers.ghpages]
 target = ghpages://beeware/beeware.github.io?cname=beeware.org

i18n/contents+zh_CN.po

@@ -5204,15 +5204,10 @@ msgid ""
 "features that haven't yet been formally released are examples of\n"
 "features that would be described using `misc` markers."
 msgstr ""
-<<<<<<< HEAD
-"`misc` 类型是为不影响用户的且无需在发布说明中注明的更改保留的。文档中的小的排"
-"版修正、CI 配置更新以及尚未正式发布的功能的错误修复都使用 `misc` 标记描述。"
-=======
 "`misc` "
 "类型是为不影响用户的、无需在更改说明中注明的更改保留的，文档中的小排版修正、"
 "CI 配置更新以及尚未正式发布的功能中的错误修复都属于使用\n"
 "`misc` 标记描述的功能。"
->>>>>>> upstream/lektor
 
 #: (content/contributing/process/contents+en.lr:page.body)
 #: https://beeware.org/contributing/process/