Commit 81840d8a authored by Greg Williams's avatar Greg Williams
Browse files

Fixed a merge issue

parent 01fd8080

src/lib/threadpool/.gitignore

+1 −1
Original line number Diff line number Diff line 
*.a

test_threadpool

test_threadpool*

*.o

*.dSYM/

test/system/test_system_bus.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include "kinetic_logger.h"

#include "kinetic_operation.h"

#include "kinetic_hmac.h"

#include "kinetic_connection.h"

#include "kinetic_session.h"

#include "kinetic_socket.h"

#include "kinetic_nbo.h"