From 5eda53d29bb857ade6f6bc11de76b0670eb423ed Mon Sep 17 00:00:00 2001
From: sadra <sadrataghavi1383@gmail.com>
Date: Tue, 15 Oct 2024 12:42:21 +0330
Subject: [PATCH] release: 1.2.23

---
 VERSION           | 2 +-
 config/nginx.conf | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/VERSION b/VERSION
index 67a331c..513314c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.22
\ No newline at end of file
+1.2.23
\ No newline at end of file
diff --git a/config/nginx.conf b/config/nginx.conf
index 3fae567..f6d51ef 100644
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -32,15 +32,12 @@ server {
 
     error_page 404 /404/;
     
-<<<<<<< HEAD
     location = /templates/404.html {
         root /var/www/html;
         internal;
     }
 
     # Static content caching
-=======
->>>>>>> efccdd81d2158f5d6f4c01ae7bd6c13e496bc015
     location /static {
         alias /heydari/static;