summaryrefslogtreecommitdiff
path: root/db/sc_config.txt
diff options
context:
space:
mode:
Diffstat (limited to 'db/sc_config.txt')
-rw-r--r--db/sc_config.txt10
1 files changed, 0 insertions, 10 deletions
diff --git a/db/sc_config.txt b/db/sc_config.txt
index 9007adcc2..06de0bdf6 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -3,15 +3,6 @@
// Structure of Database:
// SC_NAME, flag
//
-<<<<<<< HEAD
-// flag 0x1 - SC cannot be removed by death.
-// 0x2 - SC cannot be saved.
-// 0x4 - SC cannot be reset by dispell.
-// 0x8 - SC cannot be reset by clearance.
-// 0x10 - SC considered as buff and be removed by Hermode and etc.
-// 0x20 - SC considered as debuff and be removed by Gospel and etc.
-// 0x40 - SC cannot be reset when MADO Gear is taken off.
-=======
// flag 1 - SC cannot be removed by death.
// 2 - SC cannot be saved.
// 4 - SC cannot be reset by dispell.
@@ -21,7 +12,6 @@
// 64 - SC cannot be reset when MADO Gear is taken off.
//Example:
//SC_ENDURE, 21 //SC_ENDURE: cannot be removed by death and dispell and cosidered as buff. (16 + 4 + 1 = 21)
->>>>>>> upstream/master
SC_PROVOKE, 32
SC_ENDURE, 21