From 0b20041b1afaaf227908c99b6ecfb2b176009dc3 Mon Sep 17 00:00:00 2001 From: yqc <5967062152qq.com> Date: Sun, 27 Mar 2022 17:33:24 +0800 Subject: [PATCH 1/7] first commit --- yqc.c | 0 yqc.cpp | 8 ++++++++ 2 files changed, 8 insertions(+) create mode 100644 yqc.c create mode 100755 yqc.cpp diff --git a/yqc.c b/yqc.c new file mode 100644 index 0000000..e69de29 diff --git a/yqc.cpp b/yqc.cpp new file mode 100755 index 0000000..28fbdf4 --- /dev/null +++ b/yqc.cpp @@ -0,0 +1,8 @@ +#include + +int main(int argc,char *argv[]) +{ + std::<< "hello world" << std::endl; + return 0; +} + -- Gitee From 31495d19a9fc8dcfb671b21e409fad244df6c0aa Mon Sep 17 00:00:00 2001 From: yqc <5967062152qq.com> Date: Sun, 27 Mar 2022 17:37:58 +0800 Subject: [PATCH 2/7] second commit --- yqc.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/yqc.cpp b/yqc.cpp index 28fbdf4..3de6bea 100755 --- a/yqc.cpp +++ b/yqc.cpp @@ -3,6 +3,7 @@ int main(int argc,char *argv[]) { std::<< "hello world" << std::endl; + std::<< "hi" << std::endl; return 0; } -- Gitee From e41e79f5df1ee962664cf0834b42c41e4c568b3c Mon Sep 17 00:00:00 2001 From: nuanfengmuye <596706215@qq.com> Date: Sun, 27 Mar 2022 18:32:17 +0800 Subject: [PATCH 3/7] second commit --- hello.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 hello.cpp diff --git a/hello.cpp b/hello.cpp new file mode 100644 index 0000000..b224333 --- /dev/null +++ b/hello.cpp @@ -0,0 +1,9 @@ +#include +int main() + +{ + + std::<<"hello hhhh"<< std::endl; + std::<<"3"< Date: Sun, 27 Mar 2022 19:12:33 +0800 Subject: [PATCH 4/7] qq --- yqc.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 yqc.txt diff --git a/yqc.txt b/yqc.txt new file mode 100644 index 0000000..6ac395d --- /dev/null +++ b/yqc.txt @@ -0,0 +1,4 @@ +zkr：790631972 +xhj：1309911056 +yqk 2383406704 +yqc 596706215 -- Gitee From 9bbd43c7300d9c9de53eedb291bdb7433844d8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=96=E9=A3=8E=E6=9C=A8=E5=8F=B6?= <596706215@qq.com> Date: Tue, 29 Mar 2022 20:14:52 +0800 Subject: [PATCH 5/7] aba aba --- yqc.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/yqc.txt b/yqc.txt index 6ac395d..21a11ff 100644 --- a/yqc.txt +++ b/yqc.txt @@ -1,4 +1,3 @@ zkr：790631972 xhj：1309911056 yqk 2383406704 -yqc 596706215 -- Gitee From 54e3823f3054726e6c5e00e74d2a13b7d9b46644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=96=E9=A3=8E=E6=9C=A8=E5=8F=B6?= <596706215@qq.com> Date: Tue, 29 Mar 2022 21:43:37 +0800 Subject: [PATCH 6/7] awsl --- hello.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/hello.cpp b/hello.cpp index 5fa5227..433a23b 100644 --- a/hello.cpp +++ b/hello.cpp @@ -1,14 +1,3 @@ -<<<<<<< HEAD -#include -int main() - -{ - - std::<<"hello hhhh"<< std::endl; - std::<<"3"< int main(int argc, char *argv[]) { @@ -21,4 +10,4 @@ int main(int argc, char *argv[]) { std::cout << "613" << std::endl; return 0; } ->>>>>>> 4cc2db5dc300bcc9a911296a44af4dfa2f2274b1 + -- Gitee From 4f55f56e49e1e65619291be1360ed36689beb6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=96=E9=A3=8E=E6=9C=A8=E5=8F=B6?= <596706215@qq.com> Date: Wed, 30 Mar 2022 08:06:54 +0800 Subject: [PATCH 7/7] different --- different.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 different.txt diff --git a/different.txt b/different.txt new file mode 100644 index 0000000..5b92dea --- /dev/null +++ b/different.txt @@ -0,0 +1 @@ +It is different. -- Gitee