PS-2021.3.1 <rodude123@rodude123s-x360 Merge branch 'master'

This commit is contained in:
Rohit Pai 2022-01-24 16:36:43 +00:00
commit 7d27624066

View File

@ -82,6 +82,9 @@
<shortcut-conflict owner="ide"> <shortcut-conflict owner="ide">
<text encoding="base64">Y3RybCBwcmVzc2VkIE9QRU5fQlJBQ0tFVA==</text> <text encoding="base64">Y3RybCBwcmVzc2VkIE9QRU5fQlJBQ0tFVA==</text>
</shortcut-conflict> </shortcut-conflict>
<shortcut-conflict owner="vim">
<text encoding="base64">Y3RybCBwcmVzc2VkIEJBQ0tfU0xBU0g=</text>
</shortcut-conflict>
</shortcut-conflicts> </shortcut-conflicts>
</component> </component>
<component name="VimSettings"> <component name="VimSettings">