From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정

---
 src/main/webapp/index.html |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 9de0058..37c0a9b 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -42,6 +42,7 @@
     <link type="text/css" rel="stylesheet" href="custom_components/js-html-diff/js-html-diff.css">
     <link type="text/css" rel="stylesheet" href="assets/styles/main.css?version=4.0.34">
     <link type="text/css" rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:300,400,500">
+
     <!--    google font -->
     <link rel="shortcut icon" href="assets/images/favicon.png"/> <!-- �씠誘몄� �븘�씠肄� -->
 

--
Gitblit v1.8.0