From 0dc7f43b0962c73cd56eba6b87606f87e166231a Mon Sep 17 00:00:00 2001
From: Spitzer_Daniel <daniel.spitzer@inode.at>
Date: Wed, 22 Mar 2023 16:27:00 +0100
Subject: [PATCH] Remerge

---
 Layout/default/Device/Detail.php                            | 1 -
 Layout/default/Device/Form.php                              | 1 -
 Layout/default/Device/Index.php                             | 3 ---
 Layout/default/Devicemanufactor/Form.php                    | 1 -
 Layout/default/Devicemanufactor/Index.php                   | 1 -
 application/Device/Device.php                               | 1 -
 application/Device/DeviceController.php                     | 1 -
 application/Device/DeviceModel.php                          | 1 -
 application/Devicemanufactor/Devicemanufactor.php           | 1 -
 application/Devicemanufactor/DevicemanufactorController.php | 1 -
 application/Devicemanufactor/DevicemanufactorModel.php      | 1 -
 11 files changed, 13 deletions(-)

diff --git a/Layout/default/Device/Detail.php b/Layout/default/Device/Detail.php
index 3ee27f889..504c576f7 100644
--- a/Layout/default/Device/Detail.php
+++ b/Layout/default/Device/Detail.php
@@ -270,5 +270,4 @@ if ($devices->power != "0.0") {
 
     </script>
 
-
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/Device/Form.php b/Layout/default/Device/Form.php
index f3821541a..1105f2099 100644
--- a/Layout/default/Device/Form.php
+++ b/Layout/default/Device/Form.php
@@ -5,7 +5,6 @@ foreach ($devicetypes as $devicetype) {
 }
 asort($deviceTypes);
 
-
 ?>
     <link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css?<?=date('U')?>" rel="stylesheet" type="text/css"/>
     <!-- start page title -->
diff --git a/Layout/default/Device/Index.php b/Layout/default/Device/Index.php
index a873d5f48..f30cfdbf2 100644
--- a/Layout/default/Device/Index.php
+++ b/Layout/default/Device/Index.php
@@ -5,9 +5,6 @@ $pagination_entity_name = "Device";
 ?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
     <link href="<?=self::getResourcePath()?>assets/css/datatables-std.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
-    <style>
-
-    </style>
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
diff --git a/Layout/default/Devicemanufactor/Form.php b/Layout/default/Devicemanufactor/Form.php
index 0d2b6100e..796309910 100644
--- a/Layout/default/Devicemanufactor/Form.php
+++ b/Layout/default/Devicemanufactor/Form.php
@@ -1,5 +1,4 @@
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
diff --git a/Layout/default/Devicemanufactor/Index.php b/Layout/default/Devicemanufactor/Index.php
index 9b4a11186..2eb243c17 100644
--- a/Layout/default/Devicemanufactor/Index.php
+++ b/Layout/default/Devicemanufactor/Index.php
@@ -22,7 +22,6 @@ $pagination_entity_name = "Devicemanufactor";
     </div>
     <!-- end page title -->
 
-
     <div class="card">
         <div class="card-body mb-3">
             <div class="row">
diff --git a/application/Device/Device.php b/application/Device/Device.php
index 4abccfb32..43aa1e620 100644
--- a/application/Device/Device.php
+++ b/application/Device/Device.php
@@ -34,7 +34,6 @@ class Device extends mfBaseModel
                 return null;
             }
         }
-
         return $this->$name;
     }
 }
\ No newline at end of file
diff --git a/application/Device/DeviceController.php b/application/Device/DeviceController.php
index 695aae919..7e64ee1f9 100644
--- a/application/Device/DeviceController.php
+++ b/application/Device/DeviceController.php
@@ -1,7 +1,6 @@
 <?php
 class DeviceController extends mfBaseController
 {
-
     protected function init()
     {
         $this->needlogin = true;
diff --git a/application/Device/DeviceModel.php b/application/Device/DeviceModel.php
index f64b286b5..622d8e69b 100644
--- a/application/Device/DeviceModel.php
+++ b/application/Device/DeviceModel.php
@@ -17,7 +17,6 @@ class DeviceModel
 
     public static function find($data)
     {
-
     }
 
     public static function create(array $data)
diff --git a/application/Devicemanufactor/Devicemanufactor.php b/application/Devicemanufactor/Devicemanufactor.php
index 8edb05baf..b07d7722a 100644
--- a/application/Devicemanufactor/Devicemanufactor.php
+++ b/application/Devicemanufactor/Devicemanufactor.php
@@ -1,5 +1,4 @@
 <?php
-
 class Devicemanufactor extends mfBaseModel
 {
     private $editor;
diff --git a/application/Devicemanufactor/DevicemanufactorController.php b/application/Devicemanufactor/DevicemanufactorController.php
index cc535e56d..69be65c01 100644
--- a/application/Devicemanufactor/DevicemanufactorController.php
+++ b/application/Devicemanufactor/DevicemanufactorController.php
@@ -1,5 +1,4 @@
 <?php
-
 class DevicemanufactorController extends mfBaseController
 {
 
diff --git a/application/Devicemanufactor/DevicemanufactorModel.php b/application/Devicemanufactor/DevicemanufactorModel.php
index 1dc00d1a1..35f02db28 100644
--- a/application/Devicemanufactor/DevicemanufactorModel.php
+++ b/application/Devicemanufactor/DevicemanufactorModel.php
@@ -1,5 +1,4 @@
 <?php
-
 class DevicemanufactorModel {
     public $name = null;