Commit 4a08b320 authored by root's avatar root

プリント情報(code:1221-12-051)のコンフリクトを解消しました。

Modified In Workdir:学習の達成_21_社会_東書_1.dat
parent 521a0819
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"imageFile": "E:\\新学社\\中学校向け\\20200522_紙面・マスタデータサンプル\\紙面サンプルとマスタサンプル\\テンプレート用紙面サンプル\\Wプリント確認プリント_理科_表.bmp", "imageFile": "E:\\新学社\\中学校向け\\20200522_紙面・マスタデータサンプル\\紙面サンプルとマスタサンプル\\テンプレート用紙面サンプル\\Wプリント確認プリント_理科_表.bmp",
"imageWidth": 1433, "imageWidth": 1433,
"imageHeight": 2024, "imageHeight": 2024,
"update": "2020/07/17T03:25:49.892", "update": "2020/07/17T03:30:48.010",
"numberOfAttributes": 25, "numberOfAttributes": 25,
"attributes": [ "attributes": [
{ {
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
"type": "", "type": "",
"view": "", "view": "",
"score": "", "score": "",
"rectNo": 2, "rectNo": -1,
"largeQuestion": "", "largeQuestion": "",
"middleQuestion": "", "middleQuestion": "",
"smallQuestion": "", "smallQuestion": "",
...@@ -362,12 +362,12 @@ ...@@ -362,12 +362,12 @@
}, },
{ {
"rectNo": 2, "rectNo": 2,
"x": 1230, "x": 903,
"y": 127, "y": 108,
"width": 106, "width": 45,
"height": 95, "height": 57,
"flag": 1, "flag": 1,
"attributeNo": 4 "attributeNo": 3
} }
] ]
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment