merged

src/config.cpp

@@ -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;