fix

3d97b0a1 · nanahira · 8c8ee593 · 3d97b0a1
Commit 3d97b0a1 authored Apr 06, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

gframe/game.cpp gframe/game.cpp +0 -5

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -775,12 +775,7 @@ void Game::MainLoop() {
 			usleep(20000);
 #endif
 		if(cur_time >= 1000) {
-<<<<<<< HEAD
-			//modded
 			myswprintf(cap, L"KoishiPro Another FPS: %d", fps);
-=======
-			myswprintf(cap, L"KoishiPro FPS: %d", fps);
->>>>>>> master
 			device->setWindowCaption(cap);
 			fps = 0;
 			cur_time -= 1000;