1

4bc60a0d · wildfirecode · 3f49b0e4 · 4bc60a0d
Commit 4bc60a0d authored Jun 03, 2020 by wildfirecode
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

meta.json src/custom/pictures/meta.json +0 -4

No files found.
--- a/src/custom/pictures/meta.json
+++ b/src/custom/pictures/meta.json
@@ -10,11 +10,7 @@
 		"MAX_ROW": {
 			"alias": "图片分成几行",
 			"type": "number",
-<<<<<<< HEAD
 			"default": 3
-=======
-			"default": 4
->>>>>>> 942737e103f614239f421c98ab5a0e18935bc709
 		},
 		"W": {
 			"alias": "图片的宽度",