summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-07-21 11:34:35 -0300
committershennetsind <ind@henn.et>2013-07-21 11:34:35 -0300
commite3fd7cc88828865aa94ad00a2e2301a1d44e0831 (patch)
tree571b7abc97e0740f324cdf1cbab532a18084b05f /db
parenta76709480b8300c7af955f5c2c85d2039c1ee919 (diff)
parent760faf643731de9d38623dce4d129375801f8b33 (diff)
downloadhercules-e3fd7cc88828865aa94ad00a2e2301a1d44e0831.tar.gz
hercules-e3fd7cc88828865aa94ad00a2e2301a1d44e0831.tar.bz2
hercules-e3fd7cc88828865aa94ad00a2e2301a1d44e0831.tar.xz
hercules-e3fd7cc88828865aa94ad00a2e2301a1d44e0831.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'db')
-rw-r--r--db/pre-re/skill_tree.conf2
-rw-r--r--db/re/skill_tree.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index 45aea7a20..19712da50 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -1950,7 +1950,7 @@ Baby_Swordsman: {
inherit: ( "Swordsman" );
}
Baby_Magician: {
- inherit: ( "Priest" );
+ inherit: ( "Magician" );
}
Baby_Archer: {
inherit: ( "Archer" );
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 28908c0e7..4e4aa3c11 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -1947,7 +1947,7 @@ Baby_Swordsman: {
inherit: ( "Swordsman" );
}
Baby_Magician: {
- inherit: ( "Priest" );
+ inherit: ( "Magician" );
}
Baby_Archer: {
inherit: ( "Archer" );