summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md6
1 files changed, 1 insertions, 5 deletions
diff --git a/README.md b/README.md
index ece3f16..efff01a 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Compatible with Microsoft Authenticator for Windows Phone, and Google Authentica
You can use this library as well for a client application (if you want to create your own authenticator) or for a server application (add two-step authentication on your asp.net website)
-# TOTP: Time-Based One-Time Password Algorithm
+# TOTP
## Client usage
@@ -41,7 +41,6 @@ var authenticator = new TwoStepsAuthenticator.TimeAuthenticator();
bool isok = authenticator.CheckCode(secret, code);
</code></pre>
-<<<<<<< HEAD
### Used codes manager
Every code should only be used once. To prevent repeated use of a code a IUsedCodesManager interface is provided.<br>
@@ -60,6 +59,3 @@ When you create a new Authenticator, add the instance of your IUsedCodesManager
var usedCodeManager = new CustomUsedCodeManager();
var authenticator = new TwoStepsAuthenticator.TimeAuthenticator(usedCodeManager);
</code></pre>
-=======
-Every time-based code should only be used once. A built-in mechanism ensures that. If you want to control this check by your self you can pass in an instance of IUsedCodesManager.
->>>>>>> 57f740845da867fc270d9b185508bc5761aa7d45