Skip to content

S
srvpro
Commit 29574e85 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into tcg_random

parents 9f23dfb9 e3a037c3
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
ygopro-server.js
View file @ 29574e85
...@@ -3607,7 +3607,6 @@ ...@@ -3607,7 +3607,6 @@
}); });
}; };
<<<<<<< HEAD
load_dialogues_custom = global.load_dialogues_custom = function(callback) { load_dialogues_custom = global.load_dialogues_custom = function(callback) {
request({ request({
url: settings.modules.dialogues.get_custom, url: settings.modules.dialogues.get_custom,
...@@ -3628,9 +3627,6 @@ ...@@ -3628,9 +3627,6 @@
}; };
if (settings.modules.dialogues.enabled && settings.modules.dialogues.get) { if (settings.modules.dialogues.enabled && settings.modules.dialogues.get) {
=======
if (settings.modules.dialogues.get) {
>>>>>>> mc
load_dialogues(); load_dialogues();
} }
...@@ -4363,7 +4359,6 @@ ...@@ -4363,7 +4359,6 @@
}); });
}; };
<<<<<<< HEAD
load_tips_zh = global.load_tips_zh = function(callback) { load_tips_zh = global.load_tips_zh = function(callback) {
request({ request({
url: settings.modules.tips.get_zh, url: settings.modules.tips.get_zh,
...@@ -4384,9 +4379,6 @@ ...@@ -4384,9 +4379,6 @@
}; };
if (settings.modules.tips.enabled && settings.modules.tips.get) { if (settings.modules.tips.enabled && settings.modules.tips.get) {
=======
if (settings.modules.tips.get) {
>>>>>>> mc
load_tips(); load_tips();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment