Skip to content

Y
ygopro
Commit 64aff850 authored by nanahira's avatar nanahira
Browse files
Options

fixmerge

parent a8035d0d
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
gframe/gframe.cpp
View file @ 64aff850
...@@ -112,11 +112,8 @@ int main(int argc, char* argv[]) { ...@@ -112,11 +112,8 @@ int main(int argc, char* argv[]) {
} else if(!wcscmp(wargv[i], L"-k")) { // Keep on return } else if(!wcscmp(wargv[i], L"-k")) { // Keep on return
exit_on_return = false; exit_on_return = false;
keep_on_return = true; keep_on_return = true;
<<<<<<< HEAD
} else if(!wcscmp(wargv[i], L"--auto-watch")) { // Auto watch mode } else if(!wcscmp(wargv[i], L"--auto-watch")) { // Auto watch mode
auto_watch_mode = true; auto_watch_mode = true;
=======
>>>>>>> 296ee7aeae5f923b59c29c3460794e85e825e95c
} else if(!wcscmp(wargv[i], L"--deck-category")) { } else if(!wcscmp(wargv[i], L"--deck-category")) {
++i; ++i;
if(i < wargc) { if(i < wargc) {
......
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