Fix merge conflict

RaymiiOrg · web-flow · commit 1d2936dacc45 · 2020-11-15T08:59:10.000+01:00
diff --git a/src/DiskFile.cpp b/src/DiskFile.cpp
@@ -203,7 +203,7 @@ void CDiskFile::checkFileWritable(const std::string& fileName) const {
   ofs.close();
 }
 
-void CDiskFile::createDiskFile(const std::string &fileName, int diskFileSize) {
+void CDiskFile::createDiskFile(const std::string &fileName, u64 diskFileSize) {
 
   std::ofstream ofs(fileName, std::ios::binary);
   if (ofs.is_open() && ofs.good()) {

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ void CDiskFile::checkFileWritable(const std::string& fileName) const {`
`203`	`203`	`ofs.close();`
`204`	`204`	`}`
`205`	`205`
`206`		`-void CDiskFile::createDiskFile(const std::string &fileName, int diskFileSize) {`
	`206`	`+void CDiskFile::createDiskFile(const std::string &fileName, u64 diskFileSize) {`
`207`	`207`
`208`	`208`	`std::ofstream ofs(fileName, std::ios::binary);`
`209`	`209`	`if (ofs.is_open() && ofs.good()) {`