fix earlier merge conflict resolution error

Yongqu · Yongqu · commit baca8a4acb5d · 2016-07-14T15:17:49.000-07:00
diff --git a/bin/ch/stdafx.h b/bin/ch/stdafx.h
@@ -27,8 +27,6 @@
 #include "CommonDefines.h"
 #include <map>
 
-#include <map>
-
 #ifdef _WIN32
 #include <windows.h>
 #else
