PS-2022.1.2 <rodude123@Rohit-PC Merge branch 'master'

2022-06-18 14:10:13 +01:00
parent fd9ffafb8f 1f32035e83
commit e1ddb34523
1 changed files with 6 additions and 0 deletions
@@ -85,6 +85,12 @@
      <shortcut-conflict owner="vim">
        <text encoding="base64">Y3RybCBwcmVzc2VkIEJBQ0tfU0xBU0g=</text>
      </shortcut-conflict>
+      <shortcut-conflict owner="vim">
+        <text encoding="base64">Y3RybCBwcmVzc2VkIE0=</text>
+      </shortcut-conflict>
+      <shortcut-conflict owner="vim">
+        <text encoding="base64">Y3RybCBwcmVzc2VkIFU=</text>
+      </shortcut-conflict>
    </shortcut-conflicts>
  </component>
  <component name="VimSettings">