From 13b6d3ec2b1647aeea337d0e443515e2c1c5ae5d Mon Sep 17 00:00:00 2001
From: awinx <awinx@qq.com>
Date: Tue, 3 Dec 2024 01:29:56 +0800
Subject: [PATCH] Merge branch 'master' of
 http://awin-x.top:63000/awinx/java_web

---
 .idea/encodings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 2a8ecfd..c9fda07 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding" defaultCharsetForPropertiesFiles="GBK">
+    <file url="file://$PROJECT_DIR$/.gitignore" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/learn1/web/js/course-edit.js" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/learn1/web/js/index.js" charset="UTF-8" />
     <file url="PROJECT" charset="GBK" />