From 025de871983214aff002ea9efe720f6139792e2c Mon Sep 17 00:00:00 2001 From: 13th06Qyh Date: Thu, 21 Nov 2024 01:27:01 +0700 Subject: [PATCH 1/2] quynh branch conflict 1 --- midterm.c | 1 + tep.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 midterm.c create mode 100644 tep.txt diff --git a/midterm.c b/midterm.c new file mode 100644 index 0000000..512e057 --- /dev/null +++ b/midterm.c @@ -0,0 +1 @@ +Nội dung tệp A diff --git a/tep.txt b/tep.txt new file mode 100644 index 0000000..634c521 --- /dev/null +++ b/tep.txt @@ -0,0 +1 @@ +Nội dung tệp B From 94fc38843ef3337ae9e980c362e83fac914da00f Mon Sep 17 00:00:00 2001 From: 13th06Qyh Date: Thu, 21 Nov 2024 01:45:17 +0700 Subject: [PATCH 2/2] delete 1 --- midterm.c | 1 - tep.txt | 1 - 2 files changed, 2 deletions(-) delete mode 100644 midterm.c delete mode 100644 tep.txt diff --git a/midterm.c b/midterm.c deleted file mode 100644 index 512e057..0000000 --- a/midterm.c +++ /dev/null @@ -1 +0,0 @@ -Nội dung tệp A diff --git a/tep.txt b/tep.txt deleted file mode 100644 index 634c521..0000000 --- a/tep.txt +++ /dev/null @@ -1 +0,0 @@ -Nội dung tệp B