From 2b0b6a6c122fe3488f2dd010a5e7b4b203818251 Mon Sep 17 00:00:00 2001
From: KrimtonZ <krimtonz@gmail.com>
Date: Tue, 24 Mar 2020 11:57:01 -0500
Subject: [PATCH] readd merge conflicts

---
 undefined_syms.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/undefined_syms.txt b/undefined_syms.txt
index 03d92633d5..192527371d 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -442,3 +442,6 @@ D_06001BD0 = 0x06001BD0;
 // z_bg_zg
 D_060011D4 = 0x060011D4;
 D_06001080 = 0x06001080;
+
+// z_skelanime
+link_animetion_segment = 0x07000000;
\ No newline at end of file