競合ファイルの修正と住宅関係のファイル追加・修正

JPSC-PDRC-KEIO · May 7, 2021 · e8c44bb · e8c44bb
1 parent b44cecd
commit e8c44bb
Show file tree

Hide file tree

Showing 19 changed files with 186 additions and 170 deletions.
diff --git a/locale/en/LC_MESSAGES/variable/Q221.po b/locale/en/LC_MESSAGES/variable/Q221.po
@@ -195,7 +195,7 @@ msgid "p26_1"
 msgstr ""
 
 #: ../../variable/Q221.rst:120
-msgid "<<<<<<< HEAD"
+msgid ""
 msgstr ""
 
 #~ msgid "変数名: Q221"

diff --git a/locale/en/LC_MESSAGES/variable/Q222.po b/locale/en/LC_MESSAGES/variable/Q222.po
@@ -191,7 +191,7 @@ msgid "p26_1"
 msgstr ""
 
 #: ../../variable/Q222.rst:119
-msgid "<<<<<<< HEAD"
+msgid ""
 msgstr ""
 
 #~ msgid "変数名: Q222"

diff --git a/locale/en/LC_MESSAGES/variable/Q307B.po b/locale/en/LC_MESSAGES/variable/Q307B.po
@@ -195,7 +195,7 @@ msgid "p26_2"
 msgstr ""
 
 #: ../../variable/Q307B.rst:122
-msgid "<<<<<<< HEAD"
+msgid ""
 msgstr ""
 
 #~ msgid "変数名: Q307B"

diff --git a/locale/en/LC_MESSAGES/variable/Q308B.po b/locale/en/LC_MESSAGES/variable/Q308B.po
@@ -195,7 +195,7 @@ msgid "p26_2"
 msgstr ""
 
 #: ../../variable/Q308B.rst:122
-msgid "<<<<<<< HEAD"
+msgid ""
 msgstr ""
 
 #~ msgid "変数名: Q308B"

diff --git a/locale/en/LC_MESSAGES/variable/Q375A.po b/locale/en/LC_MESSAGES/variable/Q375A.po
@@ -40,7 +40,7 @@ msgstr ""
 
 #: ../../variable/Q375A.rst:30 ../../variable/Q375A.rst:47
 #: ../../variable/Q375A.rst:71
-msgid "<<<<<<< HEAD"
+msgid ""
 msgstr ""
 
 #: ../../variable/Q375A.rst:31
@@ -60,7 +60,7 @@ msgid "分類不能の回答コード"
 msgstr ""
 
 #: ../../variable/Q375A.rst:51 ../../variable/Q375A.rst:113
-msgid ">>>>>>> refs/remotes/origin/master"
+msgid ""
 msgstr ""
 
 #: ../../variable/Q375A.rst:56

diff --git a/locale/en/LC_MESSAGES/variable/Q375B.po b/locale/en/LC_MESSAGES/variable/Q375B.po
@@ -44,7 +44,7 @@ msgstr ""
 
 #: ../../variable/Q375B.rst:26 ../../variable/Q375B.rst:43
 #: ../../variable/Q375B.rst:67
-msgid "<<<<<<< HEAD"
+msgid ""
 msgstr ""
 
 #: ../../variable/Q375B.rst:27
@@ -64,7 +64,7 @@ msgid "分類不能の回答コード"
 msgstr ""
 
 #: ../../variable/Q375B.rst:47 ../../variable/Q375B.rst:197
-msgid ">>>>>>> refs/remotes/origin/master"
+msgid ""
 msgstr ""
 
 #: ../../variable/Q375B.rst:52

diff --git a/locale/en/LC_MESSAGES/variable/Q376G.po b/locale/en/LC_MESSAGES/variable/Q376G.po
@@ -43,7 +43,7 @@ msgid "選択肢 / 記入欄"
 msgstr ""
 
 #: ../../variable/Q376G.rst:26
-msgid "<<<<<<< HEAD"
+msgid ""
 msgstr ""
 
 #: ../../variable/Q376G.rst:27

diff --git a/shisan/jutaku/jukyo_mochiie.rst b/shisan/jutaku/jukyo_mochiie.rst
@@ -112,20 +112,20 @@
    :maxdepth: 1
    :hidden:
 
-   ../variable/Q375A
-   ../variable/Q375B
-   ../variable/Q375C
-   ../variable/Q375D
-   ../variable/Q375E
-   ../variable/Q375F
-   ../variable/Q802
-   ../variable/Q372
-   ../variable/Q376A
-   ../variable/Q376B
-   ../variable/Q376C
-   ../variable/Q376D
-   ../variable/Q376E
-   ../variable/Q376F
-   ../variable/Q889
-   ../variable/Q890
-   ../variable/Q891
+   /variable/Q375A
+   /variable/Q375B
+   /variable/Q375C
+   /variable/Q375D
+   /variable/Q375E
+   /variable/Q375F
+   /variable/Q802
+   /variable/Q372
+   /variable/Q376A
+   /variable/Q376B
+   /variable/Q376C
+   /variable/Q376D
+   /variable/Q376E
+   /variable/Q376F
+   /variable/Q889
+   /variable/Q890
+   /variable/Q891
diff --git a/shisan/jutaku/jukyo_syoyu.rst b/shisan/jutaku/jukyo_syoyu.rst
@@ -25,7 +25,7 @@
 
     "| 持ち家一戸建（敷地は自己所有)
     | 持ち家マンション（敷地は区分所有）
-    | 持ち家一戸建、マンション（敷地は借地）", ":doc:`Q375G </variable/Q375G>`", ":doc:`Q376G </variable/Q376G>`", ":doc:`Q1037 </variable/Q31037>`"
+    | 持ち家一戸建、マンション（敷地は借地）", ":doc:`Q375G </variable/Q375G>`", ":doc:`Q376G </variable/Q376G>`", ":doc:`Q1037 </variable/Q1037>`"
 
 
 .. csv-table:: 賃貸・その他

diff --git a/variable/Q221.rst b/variable/Q221.rst
@@ -117,9 +117,4 @@ Q221
    * p26_1
 
 
-<<<<<<< HEAD
-
-
-=======
->>>>>>> refs/remotes/origin/master
 .. index:: Q221
diff --git a/variable/Q222.rst b/variable/Q222.rst
@@ -116,9 +116,4 @@ Q222
    * p26_1
 
 
-<<<<<<< HEAD
-
-
-=======
->>>>>>> refs/remotes/origin/master
 .. index:: Q222
diff --git a/variable/Q307B.rst b/variable/Q307B.rst
@@ -119,9 +119,4 @@ Q307B
    * p26_2
 
 
-<<<<<<< HEAD
-
-
-=======
->>>>>>> refs/remotes/origin/master
 .. index:: Q307B
diff --git a/variable/Q308B.rst b/variable/Q308B.rst
@@ -119,9 +119,4 @@ Q308B
    * p26_2
 
 
-<<<<<<< HEAD
-
-
-=======
->>>>>>> refs/remotes/origin/master
 .. index:: Q308B
diff --git a/variable/Q375A.rst b/variable/Q375A.rst
@@ -1,11 +1,7 @@
 .. title:: Q375A
 .. rst-class:: item
 ====================================================================================================
-<<<<<<< HEAD
-敷地取得年
-=======
 敷地取得年〔第1～第6回〕
->>>>>>> refs/remotes/origin/master
 ====================================================================================================
 
 .. rst-class:: varname
@@ -27,34 +23,25 @@ Q375A
 選択肢 / 記入欄
 ======================
 
-<<<<<<< HEAD
-  ＿＿年
-=======
-  ＿ ＿ 年
->>>>>>> refs/remotes/origin/master
+  ＿ ＿ 年　（西暦下2桁）
 
 
 
 .. rst-class:: overflow
 桁あふれコード
 -------------------------------
-  9998
+
 
 
 .. rst-class:: not_available
 分類不能の回答コード
 -------------------------------------
-<<<<<<< HEAD
-
-=======
-
->>>>>>> refs/remotes/origin/master
 
 
 .. rst-class:: not_available
 無回答コード
 -------------------------------------
-  9999
+  99
 
 
 .. rst-class:: bikou
@@ -68,28 +55,6 @@ Q375A
 =======================================
 .. hlist::
    :columns: 3
-<<<<<<< HEAD
-
-
-   * p1_2
-
-   * p2_2
-
-   * p3_2
-
-   * p4_2
-
-   * p5a_2
-
-   * p5b_2
-
-   * p6_2
-
-
-
-
-.. index:: Q375A
-=======
 
 
    * p1_2
@@ -110,4 +75,3 @@ Q375A
 
 
 .. index:: Q375A
->>>>>>> refs/remotes/origin/master
diff --git a/variable/Q375B.rst b/variable/Q375B.rst
@@ -23,11 +23,7 @@ Q375B
 選択肢 / 記入欄
 ======================
 
-<<<<<<< HEAD
-  ＿＿＿＿㎡
-=======
   ＿ ＿ ＿ ＿ ㎡
->>>>>>> refs/remotes/origin/master
 
 
 
@@ -40,11 +36,6 @@ Q375B
 .. rst-class:: not_available
 分類不能の回答コード
 -------------------------------------
-<<<<<<< HEAD
-
-=======
-
->>>>>>> refs/remotes/origin/master
 
 
 .. rst-class:: not_available
@@ -64,72 +55,6 @@ Q375B
 =======================================
 .. hlist::
    :columns: 3
-<<<<<<< HEAD
-
-
-   * p2_2
-
-   * p3_2
-
-   * p4_2
-
-   * p5a_2
-
-   * p5b_2
-
-   * p6_2
-
-   * p7_2
-
-   * p8_2
-
-   * p9_2
-
-   * p10_2
-
-   * p11ab_2
-
-   * p11c_2
-
-   * p12_2
-
-   * p13_2
-
-   * p14_2
-
-   * p15_2
-
-   * p16abc_2
-
-   * p16d_2
-
-   * p17_2
-
-   * p18_2
-
-   * p19_2
-
-   * p20_2
-
-   * p21abcd_2
-
-   * p21e_2
-
-   * p22_2
-
-   * p23_2
-
-   * p24_2
-
-   * p25_2
-
-   * p26_2
-
-
-
-
-.. index:: Q375B
-=======
 
 
    * p2_2
@@ -194,4 +119,3 @@ Q375B
 
 
 .. index:: Q375B
->>>>>>> refs/remotes/origin/master
diff --git a/variable/Q376G.rst b/variable/Q376G.rst
@@ -23,11 +23,7 @@ Q376G
 選択肢 / 記入欄
 ======================
 
-<<<<<<< HEAD
-  ＿＿億＿＿＿0万円
-=======
-  ＿＿ 億 ＿＿＿0万円
->>>>>>> refs/remotes/origin/master
+  ＿ ＿ 億 ＿ ＿ ＿ 0万円
 
 
 

diff --git a/variable/Q889.rst b/variable/Q889.rst
@@ -23,14 +23,14 @@ Q889
 選択肢 / 記入欄
 ======================
 
-  ＿＿年
+  ＿ ＿ ＿ ＿年
 
 
 
 .. rst-class:: overflow
 桁あふれコード
 -------------------------------
-  98
+  9998
 
 
 .. rst-class:: not_available
@@ -42,7 +42,7 @@ Q889
 .. rst-class:: not_available
 無回答コード
 -------------------------------------
-  99
+  9999
 
 
 .. rst-class:: bikou