resolve conflict

ppl2/resources/views/pages/loginPage.blade.php

@@ -20,7 +20,7 @@
 <div class="panel panel-default">
 <div class="panel-heading font-bold">Login</div>
 <div class="panel-body">
-	<form class="bs-example form-horizontal" method = "POST" action = "{{URL::to('')}}">
+	<form class="bs-example form-horizontal" method = "GET" action = "{{URL::to('daftarinstitusi')}}">
 		<div class="form-group">
 		  <label class="col-lg-2 control-label">e-mail</label>
 		  <div class="col-lg-8">

ppl2/resources/views/penjadwalan.blade.php

@@ -207,7 +207,7 @@
           <h4 class="modal-title">Input Jadwal</h4>
         </div>
         <div class="modal-body">
-          <form class="form-group" method = "POST" action = "{{URL::to('')}}">
+          <form class="form-group" method = "POST" action = "{{URL::to('daftarinstitusi')}}" >
             <label for="judul">Judul kegiatan</label>
             <input type="text" class="form-control" id="judul">
             <label for="nama">Nama penyelenggara</label>
@@ -217,12 +217,15 @@
               <option>Ruangan 1</option>
               <option>Ruangan 2</option>
             </select>
-          </form>
+
+          
         </div>
         <div class="modal-footer">
-          <input type="submit" class="btn btn-primary" data-dismiss="modal" value="Submit"> 
+          <button type="submit" class="btn btn-primary">Submit</button> 
           <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+
         </div>
+        </form>
       </div>
       
     </div>