diff --git a/resources/js/ImbangDuga/index.vue b/resources/js/ImbangDuga/index.vue
index 12436c6..4a0b5e7 100644
--- a/resources/js/ImbangDuga/index.vue
+++ b/resources/js/ImbangDuga/index.vue
@@ -238,133 +238,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-export default {
-
-    data(){
-        return{
-            jenisgenerate:'none',
-            kodcaw: ''
-        }
-    },
-    methods: {
-        async generatepdf(){
-            await this.setJenis('pdf');
-
-            var tarikhMula = document.getElementById("tarikhmula");
-            var tarikhHingga = document.getElementById("tarikhhingga");
-            
-            var tarikh1 = new Date(tarikhMula.value);
-            var tarikh2 = new Date(tarikhHingga.value);
-            var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
-            var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
-
-                if(Difference_In_Days > 62){
-    
-                    Vue.swal({
-                    text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
-                    icon: 'error',
-                    allowEscapeKey : false,
-                    showCancelButton: false,
-                    showConfirmButton: true,
-                    
-                    
-                });
-              
-                } else{
-
-
-                    Vue.swal({
-                        title: 'Memuatkan...',
-                        allowEscapeKey : false,
-                        allowOutsideClick: false,
-                        showCancelButton: false,
-                        showConfirmButton: false,
-                        timer: 8000,
-                    });
-        
-                    document.getElementById("formgadaian").submit();
-                }
-
-            
-        },
-        async generateview(){
-            await this.setJenis('view');
-
-
-            var tarikhMula = document.getElementById("tarikhmula");
-            var tarikhHingga = document.getElementById("tarikhhingga");
-            
-            var tarikh1 = new Date(tarikhMula.value);
-            var tarikh2 = new Date(tarikhHingga.value);
-            var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
-            var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
-
-                if(Difference_In_Days > 62){
-    
-                    Vue.swal({
-                    text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
-                    icon: 'error',
-                    allowEscapeKey : false,
-                    showCancelButton: false,
-                    showConfirmButton: true,
-                    
-                    
-                    });
-              
-                } else{
-
-                    Vue.swal({
-                        title: 'Memuatkan...',
-                        allowEscapeKey : false,
-                        allowOutsideClick: false,
-                        showCancelButton: false,
-                        showConfirmButton: false,
-                        timer: 8000,
-                    });
-
-                    document.getElementById("formgadaian").submit();
-                }
-
-            
-            
-        },
-        Urlredirect: function() {
-         return window.route('cetak.gadaian')
-        },
-        setJenis: function(value){
-            return this.jenisgenerate = value;
-        },
-
-        dateChecking(){
-            var tarikhMula = document.getElementById("tarikhmula");
-            var tarikhHingga = document.getElementById("tarikhhingga");
-            
-            var tarikh1 = new Date(tarikhMula.value);
-            var tarikh2 = new Date(tarikhHingga.value);
-            var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
-            var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
-
-                if(Difference_In_Days > 62){
-    
-                    Vue.swal({
-                    text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
-                    icon: 'error',
-                    allowEscapeKey : false,
-                    showCancelButton: false,
-                    showConfirmButton: true,
-                    
-                    
-                });
-              
-                } 
-
-
-        }
-    }
-    
-}
-=======
 import modal from "../components/util/ImbangdugaModal.vue";
 import pagination from "../components/pagination.vue";
 
@@ -447,5 +320,4 @@ export default {
         },
     },
 };
->>>>>>> b29d4714 (added akru bulanan pecahan)
 </script>