Skip to content

A free open source IT asset/license management system

WTF

snipe9d012dd06da4
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index 9637aeb4f5..d6ce12ef03 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -280,7 +280,6 @@ class LicensePresenter extends Presenter
'formatter' => 'emailFormatter',
],
[
-<<<<<<< HEAD
'field' => 'assigned_user.companies',
'searchable' => false,
'sortable' => false,
@@ -288,15 +287,6 @@ class LicensePresenter extends Presenter
'title' => trans('general.companies'),
'visible' => true,
'formatter' => 'companiesArrayLinkFormatter',
-=======
- 'field' => 'assigned_user.company',
- 'searchable' => false,
- 'sortable' => false,
- 'switchable' => true,
- 'title' => trans('general.company'),
- 'visible' => true,
- 'formatter' => 'companiesLinkObjFormatter',
->>>>>>> d5ce5a82de (Bulk checkin license seats)
],
[
'field' => 'assigned_user.department',