From 6d9d4e629d22a5e5f3b07fed292a0e7e1f761f04 Mon Sep 17 00:00:00 2001
From: "Nastia (PozdiayevaAV)" <nastia@example.com>
Date: Thu, 30 Oct 2025 19:22:47 +0300
Subject: [PATCH] first commit

---
 .gitignore    | 4 ++++
 README.md     | 0
 vegetable.txt | 6 +++++-
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore
 create mode 100644 README.md

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5e4852a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*l.txt
+
+
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/vegetable.txt b/vegetable.txt
index 5120afb..d207dcb 100644
--- a/vegetable.txt
+++ b/vegetable.txt
@@ -1 +1,5 @@
- potato, cucumber, tomato.garlic и onion;
\ No newline at end of file
+<<<<<<< HEAD
+ potato, cucumber, tomato.garlic и onion;
+=======
+ boiled potato, fresh cucumber, fried tomato
+>>>>>>> modern