remove merge leftover artifact

Signed-off-by: Hans Zandbelt <hans.zandbelt@zmartzone.eu>
zmartzone · Feb 18, 2019 · 4fbfd9b · 4fbfd9b
1 parent 1ead99c
commit 4fbfd9b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -15,7 +15,6 @@
 11/08/2018
 - added support for the private_key_jwt authentication method; see
   #217; thanks @pamiel
->>>>>>> branch 'master' of https://github.com/zmartzone/lua-resty-openidc.git
 
 11/06/2018
 - make sure opts.discovery is resolved when "iss" is returned as part of the