PS-2022.1.2 <rodude123@Rohit-PC Merge branch 'master'
This commit is contained in:
		
						commit
						e1ddb34523
					
				@ -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">
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user