Skip to content

Commit 1e18f11

Browse files
committed
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Always keep the NEWS file from the branch when merging
2 parents f3f0ced + 944e622 commit 1e18f11

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ sapi/nsapi/nsapi.c ident
2121
sapi/continuity/capi.c ident
2222
Zend/RFCs/002.txt ident
2323
Zend/RFCs/003.txt ident
24+
NEWS merge=ours

0 commit comments

Comments
 (0)