Merge branch 'master' of git.osdn.net:/gitroot/eos/zephyr

[eos/zephyr.git] / front-end / app / templates / preview.html

diff --git a/front-end/app/templates/preview.html b/front-end/app/templates/preview.html
index bde9de3..f846d44 100755 (executable)
--- a/front-end/app/templates/preview.html
+++ b/front-end/app/templates/preview.html
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 <div class="modal-header">
     <h3>Preview</h3>
 </div>
+=======
+preview
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6