gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove conflict line

Browse source
This commit is contained in:
Gregory John Casamento 2021-11-21 02:20:53 -05:00
parent d8b2e969ef
commit 02a4762e99
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -4,6 +4,7 @@
NSURLConnectionDataDelegate protocol.
* Headers/Foundation/NSURLRequest.h: Add enum for
NSURLNetworkServiceType.
2021-11-19 Richard Frith-Macdonald <rfm@gnu.org>
* Helpers/Launch.h:
@ -19,7 +20,6 @@
waiting a fixed interval for the helper to start) while allowing
longer for the helpers to start on slow systems, and thus making
the tests more reliable.
>>>>>>> b7d82408a6fba871ce9e51f249aefc398fcd3bce
2021-11-11 Frederik Seiffert <frederik@algoriddim.com>