fixed conflict

1 files changed, 0 insertions, 52 deletions

diff --git a/static/website/templates/bug-form.html b/static/website/templates/bug-form.html
deleted file mode 100644
index 84ed6a7..0000000
--- a/static/website/templates/bug-form.html
+++ /dev/null
@@ -1,52 +0,0 @@
- <!-- bug form-->
-
-        <div class="modal-dialog">
-            <div class="modal-content">
-
-                <!-- Modal Header -->
-                <div class="modal-header">
-                    <h5 class="modal-title text-primary">Report bug/ feedback</h5>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                </div>
-
-                <!-- Modal body -->
-                <div class="modal-body">
-                <form id="bug-form" action="" method="POST" accept-charset="utf-8">  {% csrf_token %}
-                    {{ form.example }}
-                    <div id="non-field-errors">
-                    </div>
-                    <div id="id_issue_wrapper" class="wrapper">
-                        <label>Type of issue <span class="req">*</span>:</label>
-                        {{ form.issue }}
-                    </div>
-
-                    <div id="id_description_wrapper" class="wrapper">
-                        <label>Description<span class="req">*</span>:</label>
-                        {{ form.description }}
-                    </div>
-
-                    <div id="id_email_wrapper" class="wrapper">
-                        <span id="email-wrapper">
-                            {{ form.email.errors }}
-                            <label>Enter Your Email<span class="req">*</span>:</label>
-                            {{ form.email }}
-                        </span>
-                    </div>
-                <p id="question" class="text-danger""></p><input id="ans" type="text">
-                <div id="message" class="text-danger">Please verify.</div>
-                <div id="success" class="text-success">Validation complete &#x263A;</div>
-                <div id="fail" class="text-danger">Validation failed &#x2639;</div>
-                <button type="reset" class="btn btn-primary" value="reset">Reset captcha</button>
-                <input type="submit" id="bug-form-submit" class="btn btn-primary float-right">
-                    </form>
-                </div>
-
-                <!-- Modal footer -->
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-                </div>
-
-            </div>
-        </div>
- 
-    <!-- --------------------bug form modal ends------------------ -->