From e73c2e94efec4ffa9f9e103e6f3fdf91de39bff6 Mon Sep 17 00:00:00 2001
From: evam1dshk <eva.mazdrashki@gmail.com>
Date: Thu, 24 Oct 2024 10:11:54 +0300
Subject: [PATCH 1/2] changes

---
 demo.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo.txt b/demo.txt
index 7877014..4a9e370 100644
--- a/demo.txt
+++ b/demo.txt
@@ -1,2 +1,2 @@
-demo
+demo1
 test

From 5711260e6d93517fb3ed2edbe7761010b372acf7 Mon Sep 17 00:00:00 2001
From: evam1dshk <eva.mazdrashki@gmail.com>
Date: Thu, 24 Oct 2024 10:22:56 +0300
Subject: [PATCH 2/2] Resolved merge conflict.

---
 demo.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo.txt b/demo.txt
index 4a9e370..1e9db10 100644
--- a/demo.txt
+++ b/demo.txt
@@ -1,2 +1,3 @@
 demo1
 test
+