From 7627951c09c2e704b7883a1c7ccf710b5d70b675 Mon Sep 17 00:00:00 2001
From: yangsh <eogksusa@gmail.com>
Date: Fri, 2 Jan 2026 08:54:41 +0900
Subject: [PATCH] =?UTF-8?q?merge=20=ED=9B=84=20helper=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Helpers/function_helper.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/Helpers/function_helper.php b/app/Helpers/function_helper.php
index e3a8613..1ac4ad9 100644
--- a/app/Helpers/function_helper.php
+++ b/app/Helpers/function_helper.php
@@ -237,14 +237,13 @@ function han($s)
 }
 // function to_han ($str) { return preg_replace('/(\\\u[a-f0-9]+)+/e','han("$0")',$str); }
 
-<<<<<<< HEAD
-
-if (! function_exists('db_now')) {
+if (!function_exists('db_now')) {
     /**
      * DB의 현재 시간을 지정된 포맷으로 반환하는 RawSql 생성
      * @param string|null $format MariaDB 포맷 (예: '%Y-%m-%d %H:%i:%s')
      */
-    function db_now(?string $format = null) {
+    function db_now(?string $format = null)
+    {
         if ($format) {
             // 포맷이 있으면 DATE_FORMAT(NOW(), '포맷') 형태로 생성
             return new \CodeIgniter\Database\RawSql("DATE_FORMAT(NOW(), '$format')");
@@ -253,7 +252,7 @@ if (! function_exists('db_now')) {
         return new \CodeIgniter\Database\RawSql('NOW()');
     }
 }
-=======
+
 /**
  * 비밀번호 문자 조합 검사
  * - 영문 대문자 / 소문자 / 숫자 / 특수문자 중 최소 $minTypes 종류 이상
@@ -284,4 +283,3 @@ function checkPasswordTypes(string $password, int $minTypes = 2): bool
 
     return $types >= $minTypes;
 }
->>>>>>> feature/template