diff options
Diffstat (limited to 'lib/server/ServerException.txt')
| -rw-r--r-- | lib/server/ServerException.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/server/ServerException.txt b/lib/server/ServerException.txt index f8c558c6..474b4067 100644 --- a/lib/server/ServerException.txt +++ b/lib/server/ServerException.txt @@ -13,11 +13,7 @@ SocketOpenError 10 SocketPollError 11 SocketCloseError 13 SocketNameUNIXPathTooLong 14 -<<<<<<< HEAD -SocketBindError 16 Check the ListenAddresses directive in your config file -- must refer to local IP addresses only -======= SocketBindError 16 Check the ListenAddresses directive (bbstored) or CommandSocket (bbackupd) in your config file -- must refer to local IP addresses (or existing writable path) only ->>>>>>> 0.12 SocketAcceptError 17 ServerStreamBadListenAddrs 18 ServerForkError 19 |