diff options
Diffstat (limited to 'src/scepclient/scepclient.8')
| -rw-r--r-- | src/scepclient/scepclient.8 | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/scepclient/scepclient.8 b/src/scepclient/scepclient.8 index d717ba309..72750e155 100644 --- a/src/scepclient/scepclient.8 +++ b/src/scepclient/scepclient.8 @@ -239,20 +239,12 @@ Log raw hex dumps. .PP .B \-C, \-\-debug\-control .RS 4 -<<<<<<< HEAD -Log informations about control flow. -======= Log information about control flow. ->>>>>>> upstream/4.5.1 .RE .PP .B \-M, \-\-debug\-controlmore .RS 4 -<<<<<<< HEAD -Log more detailed informations about control flow. -======= Log more detailed information about control flow. ->>>>>>> upstream/4.5.1 .RE .PP .B \-X, \-\-debug\-private |