merge 오류 수정

LYW

2021-07-09 527c18879378e6f98d32d36308a2c55e870912b4

1
2
3
4
5
6
7
 
#include "stdafx.h"
#include "TempRecipe.h"
 
 
CFakeBase    gBase;
CFakeBase *g_pBase= &gBase;