@@ -74,10 +74,3 @@ |
||
| 74 | 74 | 'template' => 'AlpixelMenuBundle:CRUD:list__action_item.html.twig', |
| 75 | 75 | ], |
| 76 | 76 | <<<<<<< HEAD |
| 77 | -======= |
|
| 78 | - 'edit' => [], |
|
| 79 | ->>>>>>> master |
|
| 80 | - ], |
|
| 81 | - ]); |
|
| 82 | - } |
|
| 83 | -} |
|
@@ -74,10 +74,3 @@ |
||
| 74 | 74 | 'template' => 'AlpixelMenuBundle:CRUD:list__action_item.html.twig', |
| 75 | 75 | ], |
| 76 | 76 | <<<<<<< HEAD |
| 77 | -======= |
|
| 78 | - 'edit' => [], |
|
| 79 | ->>>>>>> master |
|
| 80 | - ], |
|
| 81 | - ]); |
|
| 82 | - } |
|
| 83 | -} |
|