バージョンアップ

Alpha9n · Alpha9n · commit 7c7c60bdbc2d · 2022-08-21T02:41:20.000+09:00
diff --git a/pack/pack.mcmeta b/pack/pack.mcmeta
@@ -1,11 +1,7 @@
 {
 	"pack":{
 		"pack_format": 6,
-<<<<<<< HEAD
 		"pack_version": "v1.17.6-beta1",
-=======
-		"pack_version": "v1.17.5",
->>>>>>> 8da722d46624db44338b7bcf1561cb376ff3de36
 		"description": "F-Tex %pack_version% §c夏祭り§eアップデート"
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"pack":{`
`3`	`3`	`"pack_format": 6,`
`4`		`-<<<<<<< HEAD`
`5`	`4`	`"pack_version": "v1.17.6-beta1",`
`6`		`-=======`
`7`		`- "pack_version": "v1.17.5",`
`8`		`->>>>>>> 8da722d46624db44338b7bcf1561cb376ff3de36`
`9`	`5`	`"description": "F-Tex %pack_version% §c夏祭り§eアップデート"`
`10`	`6`	`}`
`11`	`7`	`}`