Fixed inputmodeswitcher.html.

mockup/inputmodeswitcher.html

@@ -46,26 +46,16 @@
             </div>
             <div class="col-md-6">
                 <div class="input-group">
-<<<<<<< Temporary merge branch 1
-                    <input id="input1" name="name" class="form-control" type="text" placeholder="Name" readonly>
-                    <div class="input-group-btn">
-                        <button class="btn btn-success"
-=======
                     <input id="input1" name="name" class="form-control" type="text" placeholder="Grade">
                     <div class="input-group-btn">
                         <button class="btn btn-default"
->>>>>>> Temporary merge branch 2
                                 onclick="$('#input1').prop('readonly',!$('#input1').prop('readonly'))">
                             <span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
                         </button>
                     </div>
                 </div>
             </div>
-<<<<<<< Temporary merge branch 1
-            <div class="col-md-3 qfq-note">
-=======
             <div class="col-md-3">
->>>>>>> Temporary merge branch 2
                 <p>Note</p>
             </div>
         </div>
@@ -77,22 +67,16 @@
             <div class="col-md-6">
                 <div class="input-group">
                     <input id="passwordinput" type="password" name="password" class="form-control" type="text"
-<<<<<<< Temporary merge branch 1
-                           placeholder="Password">
-                    <div class="input-group-btn">
-                        <button class="btn btn-info"
-=======
                            placeholder="Grade">
                     <div class="input-group-btn">
                         <button class="btn btn-default"
->>>>>>> Temporary merge branch 2
                                 onclick="$('#passwordinput').attr('type',$('#passwordinput').attr('type')==='password' ? 'text': 'password')">
                             <span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>
                         </button>
                     </div>
                 </div>
             </div>
-<<<<<<< Temporary merge branch 1
+
             <div class="col-md-3 qfq-note">
                 <p>Note</p>
             </div>
@@ -110,14 +94,10 @@
                 </div>
             </div>
             <div class="col-md-3 qfq-note">
-=======
-            <div class="col-md-3">
->>>>>>> Temporary merge branch 2
                 <p>Note</p>
             </div>
         </div>
 
-<<<<<<< Temporary merge branch 1
         <div class="form-group clearfix">
             <div class="col-md-3">
                 <label>Name</label>
@@ -140,10 +120,6 @@
             </div>
         </div>
 
-
-
-=======
->>>>>>> Temporary merge branch 2
     </form>
 </div>
 
@@ -154,14 +130,11 @@
 <script src="../js/EventEmitter.min.js"></script>
 <script src="../js/qfq.debug.js"></script>
 <script type="text/javascript">
-<<<<<<< Temporary merge branch 1
-=======
 
     // Do not remove, or selenium tests will fail.
     QfqNS.QfqPage.prototype.beforeUnloadHandler = function (evt) {
     };
 
->>>>>>> Temporary merge branch 2
     $(function () {
         var qfqPage = new QfqNS.QfqPage({
             tabsId: 'myTabs',