update

ac94e6c7 · 聖園ミカ · f6a8e36c · 40fd02d9 · ac94e6c7
Commit ac94e6c7 authored Mar 03, 2024 by 聖園ミカ 🐟
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

expansions/lflist.conf expansions/lflist.conf +4 -0

No files found.
--- a/expansions/lflist.conf
+++ b/expansions/lflist.conf
@@ -1622,6 +1622,10 @@
 #666
 66600000 0 --夜行的领路人 滑头鬼
 66660010 2 --幻星集 命运之轮
+<<<<<<< HEAD
+=======
+66600000 0 --夜行的领路人 滑头鬼
+>>>>>>> 40fd02d936bd7b86b7dd0c4175e25ea5dc8495b6
 #669
 66911000 0 --寒灵刻使 雾水
 66912000 1 --Unicorn Gundam