projects
/
m6w6
/
ext-pq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
test #47
[m6w6/ext-pq]
/
.gitattributes
diff --git
a/.gitattributes
b/.gitattributes
index 29df74b84ddda6945d34a7c2c9ba34f2d1597124..8b608050fe20c19850b68c6b452c06b37467d493 100644
(file)
--- a/
.gitattributes
+++ b/
.gitattributes
@@
-1,4
+1,3
@@
package.xml merge=touch
php_pq.h merge=touch
package.xml merge=touch
php_pq.h merge=touch
-.travis.yml merge=touch
*.phar binary
*.phar binary