Commit 0ee465c1 authored by mjg226's avatar mjg226
Browse files

resolved error

parent 8a220db7
......@@ -195,17 +195,10 @@ namespace CA {
//Clock total_timer;
// Add file extension
<<<<<<< HEAD
String _filename = filename + ".asc";
// Open file
std::ofstream onfile(_filename.c_str());
=======
const char* extension = ".asc";
// Open file
std::ofstream onfile((filename + extension).c_str());
>>>>>>> 43b2f0300835482994887c602f0b7c2fb732f784
// Check if the file was open.
if (!onfile)
......
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