git.m6w6.name Git - m6w6/ext-pq/blob - .gitattributes

   1 package.xml             merge=touch
   2 php_pq.g                merge=touch