diff options
Diffstat (limited to 'src/stroke/stroke_keywords.h')
| -rw-r--r-- | src/stroke/stroke_keywords.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/stroke/stroke_keywords.h b/src/stroke/stroke_keywords.h index 76f6c1be3..ff2ba36ef 100644 --- a/src/stroke/stroke_keywords.h +++ b/src/stroke/stroke_keywords.h @@ -25,10 +25,7 @@ typedef enum { STROKE_UP, STROKE_DOWN, STROKE_DOWN_SRCIP, -<<<<<<< HEAD -======= STROKE_REKEY, ->>>>>>> upstream/4.5.1 STROKE_LOGLEVEL, STROKE_STATUS, STROKE_STATUSALL, @@ -52,11 +49,8 @@ typedef enum { STROKE_REREAD_CRLS, STROKE_REREAD_ALL, STROKE_PURGE_OCSP, -<<<<<<< HEAD -======= STROKE_PURGE_CRLS, STROKE_PURGE_CERTS, ->>>>>>> upstream/4.5.1 STROKE_PURGE_IKE, STROKE_EXPORT_X509, STROKE_LEASES, |