Compare commits

..

9 commits

Author SHA1 Message Date
4fa9078841 conflict resolved 2021-10-26 08:19:04 +02:00
b325fbb131 one more feature from myname 2021-10-26 08:11:30 +02:00
bac225c45f one more feature from eric 2021-10-26 08:07:31 +02:00
b79ac163e8 myname feature addition 2021-10-26 07:55:02 +02:00
bbff94a958 conflict treatment 2021-09-20 15:36:44 +02:00
37cfaf65f7 senn feature modification 2021-09-20 15:16:56 +02:00
5c77fdd24a guy feat test 2021-09-20 15:03:43 +02:00
920bdf70a2 else guy commit 2021-09-20 14:53:42 +02:00
23033837be Eric SENN second feature 2021-09-20 13:18:55 +02:00
2 changed files with 5 additions and 0 deletions

Binary file not shown.

View file

@ -7,5 +7,10 @@ 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;
cout << "myname has added another feature" << endl;
cout << "myname has added one more feature here" << endl;
cout << "Eric SENN has added one more feature here" << endl;
return 0;
}