fixed conflic

2017-10-31 12:13:19 +06:30
parent 56940d7f00 e3b536d58c
commit cfa819f985
69 changed files with 618 additions and 506 deletions
--- a/app/views/settings/commissions/_form.html.erb
+++ b/app/views/settings/commissions/_form.html.erb
@@ -43,10 +43,3 @@
  </div>  
 </div>
 </div>
-
-<script type="text/javascript">
-
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>