From 6f489502a5814698ac59beeaaafad064aa44f783 Mon Sep 17 00:00:00 2001 From: "https://gitea.stitch505.su:3000/Stitch505/OBS.git" Date: Wed, 4 Jun 2025 17:08:08 +0400 Subject: [PATCH] Auto base sync: 2025-06-04 17:08:08 --- .../4. Cache/Пример данных файла/Открой_меня.txt | 68 ------------------- file.txt | 1 - 2 files changed, 69 deletions(-) delete mode 100644 2. Проекты/Nextcloud/4. Cache/Пример данных файла/Открой_меня.txt delete mode 100644 file.txt diff --git a/2. Проекты/Nextcloud/4. Cache/Пример данных файла/Открой_меня.txt b/2. Проекты/Nextcloud/4. Cache/Пример данных файла/Открой_меня.txt deleted file mode 100644 index 5750fe6..0000000 --- a/2. Проекты/Nextcloud/4. Cache/Пример данных файла/Открой_меня.txt +++ /dev/null @@ -1,68 +0,0 @@ -<<<<<<< HEAD -# - - Require all denied - - - -# -# The following directives define some format nicknames for use with -# a CustomLog directive. -# -# These deviate from the Common Log Format definitions in that they use %O -# (the actual bytes sent including headers) instead of %b (the size of the -# requested file), because the latter makes it impossible to detect partial -# requests. -# -# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended. -# Use mod_remoteip instead. -# -LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined -LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %O" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent - -# Include of directories ignores editors' and dpkg's backup files, -# see README.Debian for details. - -# Include generic snippets of statements -IncludeOptional conf-enabled/*.conf - -# Include the virtual host configurations: -IncludeOptional sites-enabled/*.conf -======= -# - - Require all denied - - - -# -# The following directives define some format nicknames for use with -# a CustomLog directive. -# -# These deviate from the Common Log Format definitions in that they use %O -# (the actual bytes sent including headers) instead of %b (the size of the -# requested file), because the latter makes it impossible to detect partial -# requests. -# -# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended. -# Use mod_remoteip instead. -# -LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined -LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %O" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent - -# Include of directories ignores editors' and dpkg's backup files, -# see README.Debian for details. - -# Include generic snippets of statements -IncludeOptional conf-enabled/*.conf - -# Include the virtual host configurations: -IncludeOptional sites-enabled/*.conf ->>>>>>> 77abb6a0bf9452daf6706798b3a3b4cdd4d5f8a2 -ServerName stich.fun \ No newline at end of file diff --git a/file.txt b/file.txt deleted file mode 100644 index 345e6ae..0000000 --- a/file.txt +++ /dev/null @@ -1 +0,0 @@ -Test