バージョンアップ

freeserverproject · Aug 20, 2022 · 7c7c60b · 7c7c60b
1 parent d6e9c27
commit 7c7c60b
Showing 1 changed file with 0 additions and 4 deletions.
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アップデート"
 	}
 }