From 51e94beab70d9ee1c0cf70a1a05277a5f68a8acd Mon Sep 17 00:00:00 2001
From: rodude123 <rodude123@gmail.com>
Date: Sun, 21 Nov 2021 01:10:38 +0000
Subject: [PATCH] PS-2021.2.3 <rodude123@rodude123s-x360 Update
 vim_settings.xml	Create github-copilot.xml

---
 github-copilot.xml | 6 ++++++
 vim_settings.xml   | 3 +++
 2 files changed, 9 insertions(+)
 create mode 100644 github-copilot.xml

diff --git a/github-copilot.xml b/github-copilot.xml
new file mode 100644
index 0000000..4a362b8
--- /dev/null
+++ b/github-copilot.xml
@@ -0,0 +1,6 @@
+<application>
+  <component name="github-copilot">
+    <option name="signinNotificationShown" value="true" />
+    <option name="telemetryTermsAcceptedDate" value="2021-11-21T00:50:46.535991Z[Europe/London]" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/vim_settings.xml b/vim_settings.xml
index f54de29..c473138 100644
--- a/vim_settings.xml
+++ b/vim_settings.xml
@@ -79,6 +79,9 @@
       <shortcut-conflict owner="vim">
         <text encoding="base64">Y3RybCBwcmVzc2VkIFk=</text>
       </shortcut-conflict>
+      <shortcut-conflict owner="ide">
+        <text encoding="base64">Y3RybCBwcmVzc2VkIE9QRU5fQlJBQ0tFVA==</text>
+      </shortcut-conflict>
     </shortcut-conflicts>
   </component>
   <component name="VimSettings">