<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -823,6 +823,9 @@ nnoremap &lt;c-n&gt; :next&lt;Enter&gt;
 nnoremap &lt;c-p&gt; :prev&lt;Enter&gt;
 set confirm
 
+&quot; Disable NERD comments that conflicts with clipboard mapping
+let NERD_com_align_both_map=&quot;&lt;leader&gt;cc&quot;
+
 &quot; Set up CamelCase
 map &lt;silent&gt; w &lt;Plug&gt;CamelCaseMotion_w
 map &lt;silent&gt; b &lt;Plug&gt;CamelCaseMotion_b</diff>
      <filename>vimrc</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>071e02ec0002eb54f2726278dbba48d9690d9198</id>
    </parent>
    <parent>
      <id>dbaadc75e1e46c2a0a34c8af9258614ca82dd59a</id>
    </parent>
  </parents>
  <author>
    <name>Paul Betts</name>
    <email>paul@paulbetts.org</email>
  </author>
  <url>http://github.com/xpaulbettsx/vimrc/commit/827e1c2c8b51f96cb194670e7d63c960119b479f</url>
  <id>827e1c2c8b51f96cb194670e7d63c960119b479f</id>
  <committed-date>2009-10-19T21:12:43-07:00</committed-date>
  <authored-date>2009-10-19T21:12:43-07:00</authored-date>
  <message>Merge branch 'master' of github.com:xpaulbettsx/vimrc</message>
  <tree>0b2851c8cee83e537440aab93d284bee0003ac1a</tree>
  <committer>
    <name>Paul Betts</name>
    <email>paul@paulbetts.org</email>
  </committer>
</commit>
