There was a problem fetching the latest pipeline status.
resolve conflict
Showing
- institusi.sql 103 additions, 0 deletionsinstitusi.sql
- pendidikan.sql 11 additions, 6 deletionspendidikan.sql
- ppl2/app/Http/Controllers/InstitusiController.php 134 additions, 4 deletionsppl2/app/Http/Controllers/InstitusiController.php
- ppl2/app/Http/routes.php 23 additions, 1 deletionppl2/app/Http/routes.php
- ppl2/libs/_DS_Store 0 additions, 0 deletionsppl2/libs/_DS_Store
- ppl2/libs/assets/animate.css/animate.css 3179 additions, 0 deletionsppl2/libs/assets/animate.css/animate.css
- ppl2/libs/assets/font-awesome/css/font-awesome.css 1672 additions, 0 deletionsppl2/libs/assets/font-awesome/css/font-awesome.css
- ppl2/libs/assets/font-awesome/css/font-awesome.min.css 4 additions, 0 deletionsppl2/libs/assets/font-awesome/css/font-awesome.min.css
- ppl2/libs/assets/font-awesome/fonts/FontAwesome.otf 0 additions, 0 deletionsppl2/libs/assets/font-awesome/fonts/FontAwesome.otf
- ppl2/libs/assets/font-awesome/fonts/fontawesome-webfont.eot 0 additions, 0 deletionsppl2/libs/assets/font-awesome/fonts/fontawesome-webfont.eot
- ppl2/libs/assets/font-awesome/fonts/fontawesome-webfont.svg 520 additions, 0 deletionsppl2/libs/assets/font-awesome/fonts/fontawesome-webfont.svg
- ppl2/libs/assets/font-awesome/fonts/fontawesome-webfont.ttf 0 additions, 0 deletionsppl2/libs/assets/font-awesome/fonts/fontawesome-webfont.ttf
- ppl2/libs/assets/font-awesome/fonts/fontawesome-webfont.woff 0 additions, 0 deletionsppl2/libs/assets/font-awesome/fonts/fontawesome-webfont.woff
- ppl2/libs/jquery/_DS_Store 0 additions, 0 deletionsppl2/libs/jquery/_DS_Store
- ppl2/libs/jquery/bootstrap-daterangepicker/daterangepicker-bs3.css 335 additions, 0 deletions.../jquery/bootstrap-daterangepicker/daterangepicker-bs3.css
- ppl2/libs/jquery/bootstrap-daterangepicker/daterangepicker.js 1348 additions, 0 deletions.../libs/jquery/bootstrap-daterangepicker/daterangepicker.js
- ppl2/libs/jquery/bootstrap-filestyle/src/bootstrap-filestyle.js 338 additions, 0 deletions...ibs/jquery/bootstrap-filestyle/src/bootstrap-filestyle.js
- ppl2/libs/jquery/bootstrap-slider/bootstrap-slider.css 99 additions, 0 deletionsppl2/libs/jquery/bootstrap-slider/bootstrap-slider.css
- ppl2/libs/jquery/bootstrap-slider/bootstrap-slider.js 427 additions, 0 deletionsppl2/libs/jquery/bootstrap-slider/bootstrap-slider.js
- ppl2/libs/jquery/bootstrap-tagsinput/dist/bootstrap-tagsinput.css 46 additions, 0 deletions...s/jquery/bootstrap-tagsinput/dist/bootstrap-tagsinput.css
Please register or sign in to comment