From 0e528f4ed826918bd776d4772255dc65b06b82cb Mon Sep 17 00:00:00 2001 From: Darya Date: Sun, 13 Jul 2025 18:31:46 +0300 Subject: [PATCH 1/2] Added two files in the feature branch --- features-13-07-2025/another_file.txt | 1 + features-13-07-2025/test.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 features-13-07-2025/another_file.txt create mode 100644 features-13-07-2025/test.txt diff --git a/features-13-07-2025/another_file.txt b/features-13-07-2025/another_file.txt new file mode 100644 index 0000000..09a9a93 --- /dev/null +++ b/features-13-07-2025/another_file.txt @@ -0,0 +1 @@ +One more file in the feature branch by Darya \ No newline at end of file diff --git a/features-13-07-2025/test.txt b/features-13-07-2025/test.txt new file mode 100644 index 0000000..250f0d0 --- /dev/null +++ b/features-13-07-2025/test.txt @@ -0,0 +1 @@ +This is a test in the new features folder created by Darya ! \ No newline at end of file From 4ae310321ddf0dc561205681f8bf761532f623bd Mon Sep 17 00:00:00 2001 From: Darya Date: Sun, 13 Jul 2025 18:43:22 +0300 Subject: [PATCH 2/2] Modified text.txt --- .idea/.gitignore | 3 +++ .idea/Pull-requests.iml | 8 ++++++++ .idea/inspectionProfiles/profiles_settings.xml | 6 ++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ features-13-07-2025/test.txt | 4 +++- 7 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/Pull-requests.iml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/Pull-requests.iml b/.idea/Pull-requests.iml new file mode 100644 index 0000000..5a5fb24 --- /dev/null +++ b/.idea/Pull-requests.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..333b58d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..741353f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/features-13-07-2025/test.txt b/features-13-07-2025/test.txt index 250f0d0..5e580be 100644 --- a/features-13-07-2025/test.txt +++ b/features-13-07-2025/test.txt @@ -1 +1,3 @@ -This is a test in the new features folder created by Darya ! \ No newline at end of file +This is a test in the new features folder created by Darya ! + +I decided to make some other changes \ No newline at end of file