resolves gitignore conflicts

This commit is contained in:
Peter Thorson
2011-10-03 07:56:29 -05:00

2
.gitignore vendored
View File

@@ -20,4 +20,4 @@ test/basic/tests
libwebsocketpp.dylib.0.1.0
websocketpp.xcodeproj/xcuserdata/*
websocketpp.xcodeproj/project.xcworkspace/xcuserdata/*
websocketpp.xcodeproj/project.xcworkspace/xcuserdata/*