From aa415f2e30e117d014401318548513182e3e6c01 Mon Sep 17 00:00:00 2001
From: rodude123 <rodude123@gmail.com>
Date: Sat, 21 Aug 2021 14:34:26 +0100
Subject: [PATCH] PS-2021.2 <rodude123@rodude123s-x360 Update vim_settings.xml,
 _@user_oblivion.icls

---
 colors/_@user_oblivion.icls | 3 +--
 vim_settings.xml            | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/colors/_@user_oblivion.icls b/colors/_@user_oblivion.icls
index 8cbb9dc..9ed416f 100644
--- a/colors/_@user_oblivion.icls
+++ b/colors/_@user_oblivion.icls
@@ -4,7 +4,7 @@
     <property name="description">For anyone that has used Unity and Monodevelop. I have created the oblivion theme that everyone loved. P.S. Thanks to everyone who downloaded it.</property>
     <property name="ide">PhpStorm</property>
     <property name="ideVersion">2021.1.3.0.0</property>
-    <property name="modified">2021-08-15T16:03:26</property>
+    <property name="modified">2021-08-21T14:24:26</property>
     <property name="originalScheme">oblivion</property>
     <property name="vendorMail" />
     <property name="vendorName">Rohit Pai</property>
@@ -112,7 +112,6 @@
     <option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR">
       <value>
         <option name="FOREGROUND" value="6d9cbe" />
-        <option name="BACKGROUND" value="232525" />
       </value>
     </option>
     <option name="DEFAULT_VALID_STRING_ESCAPE">
diff --git a/vim_settings.xml b/vim_settings.xml
index c3f66de..d7c05e0 100644
--- a/vim_settings.xml
+++ b/vim_settings.xml
@@ -76,6 +76,9 @@
       <shortcut-conflict owner="vim">
         <text encoding="base64">Y3RybCBwcmVzc2VkIE8=</text>
       </shortcut-conflict>
+      <shortcut-conflict owner="vim">
+        <text encoding="base64">Y3RybCBwcmVzc2VkIFk=</text>
+      </shortcut-conflict>
     </shortcut-conflicts>
   </component>
   <component name="VimSettings">