update PO files

.gitmodules

@@ -33,7 +33,7 @@
 	url = [email protected]:carpentries-i18n/instructor-training.git
 [submodule "lc-open-refine"]
 	path = lc-open-refine
-	url = [email protected]:swcarpentry-ja/lc-open-refine
+	url = [email protected]:swcarpentry-ja/lc-open-refine.git
 [submodule "bioc-rnaseq"]
 	path = bioc-rnaseq
-	url = https://github.com/swcarpentry-ja/bioc-rnaseq.git
+	url = git@github.com:swcarpentry-ja/bioc-rnaseq.git

po/.ancestors/.bioc-rnaseq.ja.po.ancestor

@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: i18n\n"
 "Report-Msgid-Bugs-To: https://github.com/haiwen/seafile-docs/issues\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2021-08-10 23:02:57+0900\n"
+=======
+"POT-Creation-Date: 2021-08-10 23:13:53+0900\n"
+>>>>>>> 37eb758... update PO files
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"