From d99ea945f853af5c13ce6639e41ee1e3ca913ab2 Mon Sep 17 00:00:00 2001
From: Idrees Jawadwala <idreesjoharali@gmail.com>
Date: Fri, 29 Apr 2022 17:20:27 +0530
Subject: [PATCH 1/2] fix conflicts

---
 .idea/vcs.xml       |  6 ----
 .idea/workspace.xml | 67 ---------------------------------------------
 2 files changed, 73 deletions(-)
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/workspace.xml

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index ca873ed..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="85b506cf-b6d5-4bac-8be7-4abe7ebf24cc" name="Changes" comment="" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectId" id="28QMnImbN1p35QBBgvMmZRQI8pI" />
-  <component name="ProjectViewState">
-    <option name="autoscrollFromSource" value="true" />
-    <option name="autoscrollToSource" value="true" />
-    <option name="foldersAlwaysOnTop" value="false" />
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-    <option name="showMembers" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_package_manager_path" value="npm" />
-  </component>
-  <component name="RubyModuleManagerSettings">
-    <option name="blackListedRootsPaths">
-      <list>
-        <option value="$PROJECT_DIR$" />
-      </list>
-    </option>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="85b506cf-b6d5-4bac-8be7-4abe7ebf24cc" name="Changes" comment="" />
-      <created>1651144522780</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1651144522780</updated>
-      <workItem from="1651144523986" duration="2372000" />
-      <workItem from="1651163609737" duration="4050000" />
-      <workItem from="1651170330009" duration="443000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file

From 00c50afa58a8ca02b9ac6dff80d4e6ead0bbef8c Mon Sep 17 00:00:00 2001
From: Idrees Jawadwala <idreesjoharali@gmail.com>
Date: Fri, 29 Apr 2022 17:22:14 +0530
Subject: [PATCH 2/2] css fix

---
 public/amalati/theme.css   | 2 --
 public/helpbuild/theme.css | 2 --
 public/wizewerx/theme.css  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/public/amalati/theme.css b/public/amalati/theme.css
index ba5af5c..09bd5cb 100644
--- a/public/amalati/theme.css
+++ b/public/amalati/theme.css
@@ -21,8 +21,6 @@ div#kc-registration span a:hover {
 
 .app-logo {
     background-image: url(logo.png);
-    background-size: 100%;
-    background-repeat: no-repeat;
 }
 
 .login-pf-page .login-pf-page-header p::before {
diff --git a/public/helpbuild/theme.css b/public/helpbuild/theme.css
index ba5af5c..09bd5cb 100644
--- a/public/helpbuild/theme.css
+++ b/public/helpbuild/theme.css
@@ -21,8 +21,6 @@ div#kc-registration span a:hover {
 
 .app-logo {
     background-image: url(logo.png);
-    background-size: 100%;
-    background-repeat: no-repeat;
 }
 
 .login-pf-page .login-pf-page-header p::before {
diff --git a/public/wizewerx/theme.css b/public/wizewerx/theme.css
index ba5af5c..09bd5cb 100644
--- a/public/wizewerx/theme.css
+++ b/public/wizewerx/theme.css
@@ -21,8 +21,6 @@ div#kc-registration span a:hover {
 
 .app-logo {
     background-image: url(logo.png);
-    background-size: 100%;
-    background-repeat: no-repeat;
 }
 
 .login-pf-page .login-pf-page-header p::before {