Merge branch 'master' into release-1.12

2018-10-17 19:10:16 -07:00
parent 01677e2710 548b538f72
commit 9a2e390e59
558 changed files with 71868 additions and 2594 deletions
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ---
 title: 대화형 튜토리얼 - 앱 배포하기
 weight: 20
@@ -43,3 +44,51 @@ weight: 20

 </body>
 </html>
+||||||| merged common ancestors
+=======
+---
+title: 대화형 튜토리얼 - 앱 배포하기
+weight: 20
+---
+
+<!DOCTYPE html>
+
+<html lang="ko">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+<link href="/docs/tutorials/kubernetes-basics/public/css/overrides.css" rel="stylesheet">
+<script src="https://katacoda.com/embed.js"></script>
+
+<div class="layout" id="top">
+
+    <main class="content katacoda-content">
+
+        <br>
+        <div class="katacoda">
+            <div class="katacoda__alert">
+                터미널로 상호 작용하기 위해서, 데스크탑/태블릿 버전을 사용해주세요
+            </div>
+
+            <div class="katacoda__box" id="inline-terminal-1" data-katacoda-id="kubernetes-bootcamp/7"
+                 data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false"
+                 data-katacoda-font="Roboto" data-katacoda-fontheader="Roboto Slab"
+                 data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;">
+            </div>
+
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="../../explore/explore-intro/" role="button">
+                    모듈 3으로 진행하기<span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>
+>>>>>>> master