X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=front-end%2Fapp%2Ftemplates%2Fpreview.html;h=f846d44f14436eb1c7f028c3615ee03cf3071706;hb=HEAD;hp=540c54158b29c22dd4c8824476f4e1a3feb3b245;hpb=6b2b2b88511733893d2c6e7848c389abfcd53ba6;p=eos%2Fzephyr.git

diff --git a/front-end/app/templates/preview.html b/front-end/app/templates/preview.html
old mode 100644
new mode 100755
index 540c541..f846d44
--- a/front-end/app/templates/preview.html
+++ b/front-end/app/templates/preview.html
@@ -1 +1,7 @@
+<<<<<<< HEAD
+<div class="modal-header">
+    <h3>Preview</h3>
+</div>
+=======
 preview
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6