projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge branch 'R_2_5'
[m6w6/ext-http]
/
.gitattributes
diff --git
a/.gitattributes
b/.gitattributes
index 40a888438919e2b134fc35b8e5f61398e071a488..b0aef47cbde05ad2cc0e39899c08abc18ef08d57 100644
(file)
--- a/
.gitattributes
+++ b/
.gitattributes
@@
-1,2
+1,3
@@
package.xml merge=touch
package.xml merge=touch
-php_http.h merge=touc
+php_http.h merge=touch
+.travis.yml merge=touch