remove: merge conflict

2 years ago · cacc4138c4
1 changed files with 0 additions and 4 deletions
--- a/How_to_generate_an_bcrypt_hash.md
+++ b/How_to_generate_an_bcrypt_hash.md
@ -25,8 +25,4 @@ $ echo "$2b$12$coPqCsPtcF"
 b2
 $ echo '$2b$12$coPqCsPtcF'
 $2b$12$coPqCsPtcF
-<<<<<<< HEAD
 ```
-=======
-```
->>>>>>> a13c652 (update: use lowdb)