modification d erreus
This commit is contained in:
parent
3d92028409
commit
8db2174d28
1 changed files with 0 additions and 7 deletions
|
|
@ -70,12 +70,6 @@
|
||||||
operations_form_ctrl();
|
operations_form_ctrl();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
case 'add_operation':
|
|
||||||
require('controllers/operation_ctrl.php');
|
|
||||||
add_operation_write_ctrl();
|
|
||||||
break;
|
|
||||||
=======
|
|
||||||
case 'lecture':
|
case 'lecture':
|
||||||
require('views/lecture_page.php');
|
require('views/lecture_page.php');
|
||||||
break;
|
break;
|
||||||
|
|
@ -84,7 +78,6 @@
|
||||||
require('controllers/lecture_page_ctrl.php');
|
require('controllers/lecture_page_ctrl.php');
|
||||||
break;
|
break;
|
||||||
|
|
||||||
>>>>>>> c98d36d6ee22b1cc45aaf2d55c29677ea8c56d65
|
|
||||||
default:
|
default:
|
||||||
require('views/404_view.php');
|
require('views/404_view.php');
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue