address merge conflicts

[captive-validator.git] / lib / log4j-1.2.15.jar

diff --git a/lib/log4j-1.2.15.jar b/lib/log4j-1.2.15.jar
new file mode 100644 (file)
index 0000000..c930a6a
Binary files /dev/null and b/lib/log4j-1.2.15.jar differ