Missed the merge conflict.

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
2019-01-11 12:02:52 -06:00 · 2019-01-11 12:02:52 -06:00 · 7bc0168818
commit 7bc0168818
parent bebd71e76f
1 changed files with 0 additions and 4 deletions
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@ -33,12 +33,8 @@ Here is the list of commands available with a short syntax reminder. Use the
  sign-req <type> <filename_base>
  build-client-full <filename_base> [ cmd-opts ]
  build-server-full <filename_base> [ cmd-opts ]
-<<<<<<< HEAD
  revoke <filename_base> [cmd-opts]
-=======
  build-serverClient-full <filename_base> [ cmd-opts ]
-  revoke <filename_base>
->>>>>>> 3ec93810e45d1e684f902a9847a1afe3ffc87a04
  gen-crl
  update-db
  show-req <filename_base> [ cmd-opts ]