Commit f28f9d40 authored by Mall, Anon's avatar Mall, Anon
Browse files

merged

parent 0cce83b1
......@@ -34,11 +34,7 @@ Config::readFile()
while(!in.eof() && !in.fail()){
getline(in, line);
<<<<<<< HEAD
cout << __func__ << ": got line \"" << line << "\"" << endl;
=======
//cout << __func__ << ": got line \"" << line << "\"" << endl;
>>>>>>> c142a992026118d47db5bce479bf514597e6e261
if(line.empty()){
continue;
......
Supports Markdown
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