diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 697358a..9522bb3 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,7 +6,7 @@ - + diff --git a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e.xml b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e.xml index 5df55e7..16d4400 100644 --- a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e.xml +++ b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e.xml @@ -1250,265 +1250,473 @@ test\\_%|schema||''||UPDATE|G
- +
+
+
+
+
+
+ 1 varchar(20)|0s 1 - + 2 varchar(20)|0s 1 - + 3 varchar(20)|0s 1 - + 4 varchar(20)|0s - + 5 varchar(30)|0s 1 - + 6 varchar(20)|0s 1 - + 1 identificationNumber 1 - + 1 int(11)|0s 1 null - + 2 int(11)|0s 1 - + 3 - varchar(40)|0s + varchar(100)|0s - + 4 datetime|0s 1 - + 5 int(11)|0s 1 - - 6 - varchar(12)|0s - 1 - - + 7 varchar(100)|0s 1 - + 8 varchar(300)|0s 1 - + 9 int(11)|0s - + + 6 + varchar(100)|0s + 1 + + + 10 + varchar(100)|0s + + + 11 + int(11)|0s + 0 + + idx btree - + 1 gallary_id 1 - + idx user idx - + 1 bigint(21)|0s 1 - + 2 bigint(21)|0s 1 - + 3 bigint(21)|0s 1 - + 4 start value when sequences is created or value if RESTART is used bigint(21)|0s 1 - + 5 increment value bigint(21)|0s 1 - + 6 bigint(21) unsigned|0s 1 - + 7 0 if no cycles are allowed, 1 if the sequence should begin a new cycle when maximum_value is passed tinyint(1) unsigned|0s 1 - + 8 How many cycles have been done bigint(21)|0s 1 - + 1 bigint(21)|0s 1 - + 2 bigint(21)|0s 1 - + 3 bigint(21)|0s 1 - + 4 start value when sequences is created or value if RESTART is used bigint(21)|0s 1 - + 5 increment value bigint(21)|0s 1 - + 6 bigint(21) unsigned|0s 1 - + 7 0 if no cycles are allowed, 1 if the sequence should begin a new cycle when maximum_value is passed tinyint(1) unsigned|0s 1 - + 8 How many cycles have been done bigint(21)|0s 1 - + 1 int(11)|0s 1 - + 2 - varchar(30)|0s + varchar(300)|0s - + 3 varchar(30)|0s 1 - + 4 varchar(12)|0s 1 - + 5 - varchar(12)|0s + varchar(50)|0s 1 - + 6 char(11)|0s 1 - + 7 varchar(3)|0s 1 - + 8 char(4)|0s 1 - + 9 char(2)|0s 1 - + 10 char(2)|0s 1 - + 11 varchar(200)|0s 1 - + 12 int(11)|0s 1 - + 13 int(11)|0s 1 - + 14 int(11)|0s 1 - + 15 int(1)|0s 1 0 - + + 1 + idx + 1 + + + 1 + int(11)|0s + 1 + + + 2 + int(8)|0s + 1 + + + 3 + varchar(20)|0s + 1 + + + 4 + datetime|0s + 1 + + + 5 + varchar(30)|0s + 1 + + + idx + btree + + + 1 + mid + 1 + + + idx + user + idx + + + 1 + int(11)|0s + 1 + + + 2 + varchar(30)|0s + 1 + + + 3 + datetime|0s + 1 + + + 4 + int(11)|0s + 1 + + + idx + btree + + + gallary_id + btree + + + 1 + order_number + 1 + + + idx + user + idx + + + gallary_id + gallary + gallary_id + + + 1 + int(11)|0s + 1 + + + 2 + int(11)|0s + 1 + + + idx + btree + + + idx + user + idx + + + 1 + int(11)|0s + 1 + + + 2 + int(10)|0s + 1 + 0 + + + 3 + int(10)|0s + 1 + 0 + + + 4 + int(10)|0s + 1 + 0 + + + 5 + int(10)|0s + 1 + 0 + + + 6 + int(10)|0s + 1 + 0 + + 1 idx 1 + + idx + user + idx + + + 1 + int(11)|0s + 1 + + + 2 + int(10)|0s + + + 1 + gallary_id + 1 + + + gallary_id + gallary + gallary_id + + + 1 + int(11)|0s + 1 + + + 2 + int(11)|0s + 1 + + + gallery_id + btree + + + idx + btree + + + idx + user + idx + + + gallery_id + gallary + gallary_id + \ No newline at end of file diff --git a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat index 608e48b..fe798c2 100644 Binary files a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat and b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat differ diff --git a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values index fe3e0fb..68c751f 100644 Binary files a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values and b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values differ diff --git a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values.at b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values.at index 2d0285b..b8e0aa5 100644 Binary files a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values.at and b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values.at differ diff --git a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values.s b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values.s index aa8e734..092310e 100644 --- a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values.s +++ b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values.s @@ -1 +1 @@ -qaO[OQOQOQOPOPOPPPPPPPPPPPPPPPP \ No newline at end of file +qaO[OQOQOQOPOPOPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPMPPNPPNPPNPPNPPNPPNPPNPPNPP \ No newline at end of file diff --git a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat_i b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat_i index 04aa23c..66c5ff3 100644 Binary files a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat_i and b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat_i differ diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_09_22_1_32___Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_09_22_1_32___Changes_.xml deleted file mode 100644 index 1ba8f45..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_09_22_1_32___Changes_.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_09_22_1_32_\354\230\244\354\240\204_[Changes]/shelved.patch" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_09_22_1_32_\354\230\244\354\240\204_[Changes]/shelved.patch" deleted file mode 100644 index bd49c52..0000000 --- "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_09_22_1_32_\354\230\244\354\240\204_[Changes]/shelved.patch" +++ /dev/null @@ -1,18 +0,0 @@ -Index: .idea/compiler.xml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>\n\n \n \n \n \n \n \n \n \n \n \n \n \n -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/.idea/compiler.xml b/.idea/compiler.xml ---- a/.idea/compiler.xml (revision 6b23d6c59fde4165fdb77307d4d8816e8a973721) -+++ b/.idea/compiler.xml (date 1632241891305) -@@ -11,5 +11,6 @@ - - - -+ - - -\ No newline at end of file diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38___Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38___Changes_.xml new file mode 100644 index 0000000..0e062f9 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38___Changes_.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38___Changes_1.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38___Changes_1.xml new file mode 100644 index 0000000..b099e10 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38___Changes_1.xml @@ -0,0 +1,24 @@ + + \ No newline at end of file diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/entities.dat" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/entities.dat" new file mode 100644 index 0000000..1ba9bea Binary files /dev/null and "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/entities.dat" differ diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/entities.dat.values" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/entities.dat.values" new file mode 100644 index 0000000..4ce0275 Binary files /dev/null and "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/entities.dat.values" differ diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/entities.dat.values.s" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/entities.dat.values.s" new file mode 100644 index 0000000..f1735cc --- /dev/null +++ "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/entities.dat.values.s" @@ -0,0 +1 @@ +qaO[OQOQOQOPOPOPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP \ No newline at end of file diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/entities.dat_i" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/entities.dat_i" new file mode 100644 index 0000000..7dfe7bb Binary files /dev/null and "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/entities.dat_i" differ diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/shelved.patch" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/shelved.patch" new file mode 100644 index 0000000..40f10ef --- /dev/null +++ "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]/shelved.patch" @@ -0,0 +1,115 @@ +Index: .idea/workspace.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/workspace.xml b/.idea/workspace.xml +--- a/.idea/workspace.xml ++++ b/.idea/workspace.xml +@@ -5,7 +5,14 @@ + + + ++ ++ ++ ++ + ++ ++ ++ + + + + +- + + +Index: photo/src/main/resources/com/example/photologger/photo/mapper/GalleryMapper.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\n\n\n\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n\n \n INSERT INTO gallery (\n gallery_id,\n idx,\n gallery_adress,\n gallery_time,\n gallery_seseon,\n gallery_direaction_x,\n gallery_name,\n gallery_image_location,\n gallery_subscibe_count,\n gallery_direaction_y,\n gallery_views\n )\n VALUES (\n #{galleryId},\n #{idx},\n #{galleryAdress},\n #{galleryTime},\n #{gallerySeseon},\n #{galleryDireactionX},\n #{galleryName},\n #{galleryImageLocation},\n #{gallerySubscribeCount},\n #{galleryDireactionY},\n #{galleryViews}\n )\n \n\n \n UPDATE user\n SET profile_Image_location = #{profileImageLocation},\n nick_name = #{nickName},\n password = #{password}\n WHERE idx = #{idx}\n \n\n \n\n \n UPDATE gallery\n SET gallery_views = gallery_views + 1\n WHERE gallery_id = #{glleryId}\n \n\n\n +=================================================================== +diff --git a/photo/src/main/resources/com/example/photologger/photo/mapper/GalleryMapper.xml b/photo/src/main/resources/com/example/photologger/photo/mapper/GalleryMapper.xml +--- a/photo/src/main/resources/com/example/photologger/photo/mapper/GalleryMapper.xml ++++ b/photo/src/main/resources/com/example/photologger/photo/mapper/GalleryMapper.xml +@@ -16,6 +16,26 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -53,13 +73,10 @@ + nick_name = #{nickName}, + password = #{password} + WHERE idx = #{idx} ++ ; + + +- ++ + + + UPDATE gallery +Index: photo/src/main/java/com/example/photologger/photo/controller/GalleryController.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>package com.example.photologger.photo.controller;\n\nimport com.example.photologger.photo.domain.Gallery;\nimport com.example.photologger.photo.service.GalleryService;\nimport lombok.extern.slf4j.Slf4j;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.web.bind.annotation.GetMapping;\nimport org.springframework.web.bind.annotation.PathVariable;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.ResponseBody;\nimport org.springframework.web.bind.annotation.RestController;\n\n@Slf4j\n@RequestMapping(\"/gallery\")\n@RestController\npublic class GalleryController {\n\n private final GalleryService galleryService;\n\n @Autowired\n public GalleryController(GalleryService galleryService){\n this.galleryService = galleryService;\n }\n\n /*갤러리 정보 조회*/\n @GetMapping(value = \"/{gallery_id}\")\n @ResponseBody\n public Gallery lookUp(\n @PathVariable(value = \"gallery_id\") Integer galleryId\n ) throws Exception{\n Gallery gallary = galleryService.galleryLookUp(galleryId);\n return gallary;\n }\n}\n +=================================================================== +diff --git a/photo/src/main/java/com/example/photologger/photo/controller/GalleryController.java b/photo/src/main/java/com/example/photologger/photo/controller/GalleryController.java +--- a/photo/src/main/java/com/example/photologger/photo/controller/GalleryController.java ++++ b/photo/src/main/java/com/example/photologger/photo/controller/GalleryController.java +@@ -28,7 +28,7 @@ + public Gallery lookUp( + @PathVariable(value = "gallery_id") Integer galleryId + ) throws Exception{ +- Gallery gallary = galleryService.galleryLookUp(galleryId); +- return gallary; ++ Gallery gallery = galleryService.galleryLookUp(galleryId); ++ return gallery; + } + } diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/entities.dat" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/entities.dat" new file mode 100644 index 0000000..1ba9bea Binary files /dev/null and "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/entities.dat" differ diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/entities.dat.values" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/entities.dat.values" new file mode 100644 index 0000000..4ce0275 Binary files /dev/null and "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/entities.dat.values" differ diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/entities.dat.values.s" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/entities.dat.values.s" new file mode 100644 index 0000000..f1735cc --- /dev/null +++ "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/entities.dat.values.s" @@ -0,0 +1 @@ +qaO[OQOQOQOPOPOPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP \ No newline at end of file diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/entities.dat_i" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/entities.dat_i" new file mode 100644 index 0000000..7dfe7bb Binary files /dev/null and "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/entities.dat_i" differ diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/shelved.patch" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/shelved.patch" new file mode 100644 index 0000000..de3fc89 --- /dev/null +++ "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_19_2_38_\354\230\244\354\240\204_[Changes]1/shelved.patch" @@ -0,0 +1,18 @@ +Index: photo/src/main/resources/com/example/photologger/photo/mapper/UserMapper.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\n\n\n\n \n \n \n\n \n \n \n UPDATE user\n SET password = #{password}\n where idx = #{idx}\n \n\n\n \n UPDATE user\n SET password = #{password}\n where email = #{email}\n \n\n \n UPDATE user\n SET name = #{name}\n WHERE idx = #{idx}\n \n\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/photo/src/main/resources/com/example/photologger/photo/mapper/UserMapper.xml b/photo/src/main/resources/com/example/photologger/photo/mapper/UserMapper.xml +--- a/photo/src/main/resources/com/example/photologger/photo/mapper/UserMapper.xml ++++ b/photo/src/main/resources/com/example/photologger/photo/mapper/UserMapper.xml +@@ -22,6 +22,7 @@ + AND name = #{name} + AND phone_number = #{phoneNumber} + ++ + + + UPDATE user diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08___Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08___Changes_.xml new file mode 100644 index 0000000..5e74c3e --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08___Changes_.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08_\354\230\244\355\233\204_[Changes]/shelved.patch" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08_\354\230\244\355\233\204_[Changes]/shelved.patch" new file mode 100644 index 0000000..1d4a37c --- /dev/null +++ "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08_\354\230\244\355\233\204_[Changes]/shelved.patch" @@ -0,0 +1,30 @@ +Index: .idea/workspace.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/workspace.xml b/.idea/workspace.xml +--- a/.idea/workspace.xml (revision 76c79e88a3b51ad26e756b6714c80b742386f9cf) ++++ b/.idea/workspace.xml (date 1637672825920) +@@ -5,10 +5,7 @@ + + + +- + +- +- + + diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09___Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09___Changes_.xml new file mode 100644 index 0000000..b6b4d7d --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09___Changes_.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09_\354\230\244\355\233\204_[Changes]/shelved.patch" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09_\354\230\244\355\233\204_[Changes]/shelved.patch" new file mode 100644 index 0000000..c833d47 --- /dev/null +++ "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09_\354\230\244\355\233\204_[Changes]/shelved.patch" @@ -0,0 +1,132 @@ +Index: .idea/workspace.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\n\n \n \n \n \n \n<<<<<<< HEAD\n=======\n \n \n>>>>>>> a990b919b6a1cab569a1939f370aefd4b13a3e87\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/workspace.xml b/.idea/workspace.xml +--- a/.idea/workspace.xml ++++ b/.idea/workspace.xml +@@ -4,13 +4,11 @@ +