From 5c2c6a6f6ec5514e2cac87d539485aa4b9330e66 Mon Sep 17 00:00:00 2001
From: SilverFire - Dima Naumenko <d.naumenko.a@gmail.com>
Date: Wed, 6 May 2015 09:27:46 +0000
Subject: [PATCH] Git inconsistence fix

---
 assets/combo2/Account.php   | 94 ++++++++++++++++++-------------------
 assets/combo2/DbService.php | 30 ++++++------
 views/db/create.php         | 26 +++++-----
 3 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/assets/combo2/Account.php b/assets/combo2/Account.php
index 43d4d115..f383cd79 100644
--- a/assets/combo2/Account.php
+++ b/assets/combo2/Account.php
@@ -1,48 +1,48 @@
-<?php
-
-namespace hipanel\modules\hosting\assets\combo2;
-
-use hipanel\widgets\Combo2Config;
-use yii\helpers\ArrayHelper;
-
-/**
- * Class Account
- */
-class Account extends Combo2Config
-{
-    /** @inheritdoc */
-    public $type = 'hosting/account';
-
-    /** @inheritdoc */
-    public $name = 'login';
-
-    /** @inheritdoc */
-    public $url = '/hosting/account/search';
-
-    /** @inheritdoc */
-    public $_return = ['id', 'client', 'client_id', 'device', 'device_id'];
-
-    /** @inheritdoc */
-    public $_rename = ['text' => 'login'];
-
-    /** @inheritdoc */
-    public $_filter = [
-        'client' => 'client/client',
-        'server' => 'server/server',
-    ];
-
-    /** @inheritdoc */
-    function getConfig($config = [])
-    {
-        $config = ArrayHelper::merge([
-            'clearWhen' => ['client/client', 'server/server'],
-            'affects'   => [
-                'client/seller' => 'seller',
-                'client/client' => 'client',
-                'server/server' => 'device',
-            ]
-        ], $config);
-
-        return parent::getConfig($config);
-    }
+<?php
+
+namespace hipanel\modules\hosting\assets\combo2;
+
+use hipanel\widgets\Combo2Config;
+use yii\helpers\ArrayHelper;
+
+/**
+ * Class Account
+ */
+class Account extends Combo2Config
+{
+    /** @inheritdoc */
+    public $type = 'hosting/account';
+
+    /** @inheritdoc */
+    public $name = 'login';
+
+    /** @inheritdoc */
+    public $url = '/hosting/account/search';
+
+    /** @inheritdoc */
+    public $_return = ['id', 'client', 'client_id', 'device', 'device_id'];
+
+    /** @inheritdoc */
+    public $_rename = ['text' => 'login'];
+
+    /** @inheritdoc */
+    public $_filter = [
+        'client' => 'client/client',
+        'server' => 'server/server',
+    ];
+
+    /** @inheritdoc */
+    function getConfig($config = [])
+    {
+        $config = ArrayHelper::merge([
+            'clearWhen' => ['client/client', 'server/server'],
+            'affects'   => [
+                'client/seller' => 'seller',
+                'client/client' => 'client',
+                'server/server' => 'device',
+            ]
+        ], $config);
+
+        return parent::getConfig($config);
+    }
 }
\ No newline at end of file
diff --git a/assets/combo2/DbService.php b/assets/combo2/DbService.php
index e88c7df6..b63a1d8e 100644
--- a/assets/combo2/DbService.php
+++ b/assets/combo2/DbService.php
@@ -1,16 +1,16 @@
-<?php
-
-namespace hipanel\modules\hosting\assets\combo2;
-
-/**
- * Class DbService
- */
-class DbService extends Service
-{
-    /** @inheritdoc */
-    public $type = 'hosting/service/db';
-
-    /** @inheritdoc */
-    public $softType = 'db';
-
+<?php
+
+namespace hipanel\modules\hosting\assets\combo2;
+
+/**
+ * Class DbService
+ */
+class DbService extends Service
+{
+    /** @inheritdoc */
+    public $type = 'hosting/service/db';
+
+    /** @inheritdoc */
+    public $softType = 'db';
+
 }
\ No newline at end of file
diff --git a/views/db/create.php b/views/db/create.php
index 8690c58d..68374188 100644
--- a/views/db/create.php
+++ b/views/db/create.php
@@ -1,13 +1,13 @@
-<?php
-/* @var $this yii\web\View */
-/* @var $model frontend\modules\ticket\models\Thread */
-/* @var $type string */
-
-$this->title                   = $title[$type];
-$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Databases'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
-?>
-
-<div class="account-create">
-    <?= $this->render('_form', compact('model')) ?>
-</div>
+<?php
+/* @var $this yii\web\View */
+/* @var $model frontend\modules\ticket\models\Thread */
+/* @var $type string */
+
+$this->title                   = $title[$type];
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Databases'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+<div class="account-create">
+    <?= $this->render('_form', compact('model')) ?>
+</div>