Commit 6930062c authored by Alice AUBERT's avatar Alice AUBERT

Resolved hello.cpp conflict

parents 6e83e991 1bf70448
......@@ -2,5 +2,6 @@
int main(){
std::cout << "Hello Ecole Polytechnique!" << std::endl;
std::cout << "Hello Palaiseau!" << std::endl;
return 0;
}
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