ericsenn/tg_git
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

conflict treatment

Browse source
This commit is contained in:
ericsenn 2021-09-20 15:36:44 +02:00
parent 37cfaf65f7 5c77fdd24a
commit bbff94a958
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/hello_all.cpp
View file

@ -8,5 +8,6 @@ using namespace std;
int main(int argc,char **argv) {
cout << "Eric SENN has added his feature" << endl;
cout << "Eric SENN has added another feature modified" << endl;
cout << "Else GUY has added another feature there" << endl;
return 0;
}