fixmerge

premake/gframe/ygopro.rc

-<<<<<<< HEAD
 1 ICON "ygopro.ico"
 
 1 VERSIONINFO
@@ -26,32 +25,3 @@ BEGIN
 VALUE "Translation", 0x804, 1200
 END
 END
-=======
-1 ICON "ygopro.ico"
-
-1 VERSIONINFO
-FILEVERSION 1, 0, 35, 1
-PRODUCTVERSION 1, 0, 35, 1
-FILEOS 0x4
-FILETYPE 0x1
-
-BEGIN
-BLOCK "StringFileInfo"
-BEGIN
-BLOCK "080404b0"
-BEGIN
-VALUE "FileDescription", "KoishiPro"
-VALUE "InternalName", "KoishiPro"
-VALUE "LegalCopyright", "Copyright (C) 2019 Nanahira"
-VALUE "OriginalFilename", "ygopro.exe"
-VALUE "ProductName", "KoishiPro"
-VALUE "FileVersion", "Kitasaitama"
-VALUE "ProductVersion", "Kitasaitama"
-END
-END
-BLOCK "VarFileInfo"
-BEGIN
-VALUE "Translation", 0x804, 1200
-END
-END
->>>>>>> master