diff options
Diffstat (limited to 'src/pluto/ca.c')
| -rw-r--r-- | src/pluto/ca.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/pluto/ca.c b/src/pluto/ca.c index 713d56ef1..add85def8 100644 --- a/src/pluto/ca.c +++ b/src/pluto/ca.c @@ -629,11 +629,7 @@ void add_ca_info(const whack_message_t *msg) if (strncasecmp(msg->ocspuri, "http", 4) == 0) ca->ocspuri = clone_str(msg->ocspuri); else -<<<<<<< HEAD - plog(" ignoring ocspuri with unkown protocol"); -======= plog(" ignoring ocspuri with unknown protocol"); ->>>>>>> upstream/4.5.1 } /* add crl uris */ |