diff --git a/_data/navigation.yml b/_data/navigation.yml index b8a60e2b1018..91303554abb0 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -37,5 +37,4 @@ docs: - title: "Git" url: git/ category: "git" - - + \ No newline at end of file diff --git a/_includes/nav_list b/_includes/nav_list index 8ec5550754aa..e63305e1e737 100644 --- a/_includes/nav_list +++ b/_includes/nav_list @@ -12,6 +12,7 @@ {% else %} {{ nav.title }} {% endif %} +<<<<<<< HEAD {% if nav.children != null %} diff --git "a/_posts/2024-05-22-aws09_S3\354\227\220 \353\214\200\355\225\234 \352\270\260\353\263\270 \352\260\234\353\205\220.md" "b/_posts/2024-05-22-aws09_S3\354\227\220 \353\214\200\355\225\234 \352\270\260\353\263\270 \352\260\234\353\205\220.md" index 15e924708003..86bc52beb297 100644 --- "a/_posts/2024-05-22-aws09_S3\354\227\220 \353\214\200\355\225\234 \352\270\260\353\263\270 \352\260\234\353\205\220.md" +++ "b/_posts/2024-05-22-aws09_S3\354\227\220 \353\214\200\355\225\234 \352\270\260\353\263\270 \352\260\234\353\205\220.md" @@ -9,7 +9,6 @@ post-header: false --- - ## S3 (Simple Storage Service)의 특징 안전하고 가변적인 Object 저장공간을 제공한다. (ex. Google Cloud)