Commit f9362163 authored by nanahira's avatar nanahira Committed by GitHub

fix rebase

parent 18bfdbf5
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "materials.h" #include "materials.h"
#include "../ocgcore/common.h" #include "../ocgcore/common.h"
namespace ygo {g namespace ygo {
bool ClientField::OnEvent(const irr::SEvent& event) { bool ClientField::OnEvent(const irr::SEvent& event) {
if(OnCommonEvent(event)) if(OnCommonEvent(event))
......
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