summaryrefslogtreecommitdiff
path: root/passwords
diff options
context:
space:
mode:
Diffstat (limited to 'passwords')
-rw-r--r--passwords/main.asc45
1 files changed, 14 insertions, 31 deletions
diff --git a/passwords/main.asc b/passwords/main.asc
index b8ff442..e284c92 100644
--- a/passwords/main.asc
+++ b/passwords/main.asc
@@ -1,35 +1,18 @@
-----BEGIN PGP MESSAGE-----
Version: GnuPG v1
-<<<<<<< HEAD
-hQIMA2AwAsuYqCfXAQ//Rh9CxPBXFCTJWb50Leo+ajlLyNp24f18iKgHajWCWl+L
-LnHZULza+gGDCZ0nCx5j0R8KLLmzBm7OtHQeinGt6GA5hn6eswjHUhRK5JJmmaU/
-0YICerPyxAMwb/ilseH9dzyJEWsfh37vK8+ErxlsaOSDseWTGpI9rSAo2jUucx3C
-0HJo1mXz6CTFjqy/DzwVnuXWEB4eFLyp7u68oHUK8OB2hWAVNjqTEZO5hAfpC/+A
-b2a1UKUdPMxTOkyfj7BcZN2vQZbw/j/h4LzLcu6CulpC5qG2/n4zFfoHyKNlzKGg
-SLzilb2dRLz572jVuyHwfvU2qjbty/py5uuyxjSermmi1vRbgHxEEJ3zKARTKePb
-9IxxBRFej4N7QHyU9HSIwMcq/5F0wanTddr9gpmA6KJDbJ+X5OKJ16TtNj2gbj7w
-re2EFoms5EKOiDplTo9A0ssUzvN4mNmip9JbGKOf5s6kCgkBGVU4Zreo+Rv7h9B1
-x+42TjozDOkOsyikW+wVCWl6K32SgVREXeBhG1t9Z1QQCdHKWNi/oc5lreisX+co
-3mQepxyk7/ypLJOxkyUjLqfVmLQUwZ/DLbtnYITA9XmuwfeAlRThj0LhVT4eRjW5
-/fxvTee2bbNp89nBSUv1CbW/DVkgCY82QsOMuI1RbYxjnN9zV/VEM+j9O9EEJGjS
-SwFdNekRg7yThIt1NpeYZO5CYbxF6dPE4bK7Xk3mBnlK1mfN13DiGZQLQBcbdLhE
-NsllvDHSGxV6JZ5SQWlX2tV7jdnt2mzsGV0OTQ==
-=wQzI
-=======
-hQIMA2AwAsuYqCfXARAAlhm8lNd42G6z48Ox7gGPkbEaLhN5ujX7mjZfsI5nwoQw
-pASBnrOdhQQPPu0QLTmCmnHNIsTc8lcH4WJ00d7txyRZRFdxVdKtb2qLSyHgleEG
-7xDy3svWRRHaRmPpzCBPvQ/zmD728ZFELcgrY5/VdG4XMQ7XQLt4fCFM825L4htv
-3ReCW9s5Ex6ifviAhKIJABCwN2P0O7iKgUHn4Nclfdxq+K79ztoJBvAFLwslk9la
-MawPpbEORx9Y1GnZJZp1Cz6ZAWuwGbV5e31+twsbOOMHTR/UflxOCZVqvXr+KwCW
-QeEdYgOmFj4A4YQAB0zHl7Pok5A7zUgI1Su+lJcHK7vVr5ZdaHR0w+qTBt72h5G+
-+buySGN0b0zypyS4AkQB8CfVcl8JMZJuTH3NervvY16hvZ/spWkVpwszjhgivVkL
-9NzhcrUofnnxI10AoyTbb7sKgcwnxufgamoCOEdDZwGxANx1DxDw7UMPNOgB9D7/
-6acqBgopqhjDfuNoV4BSFuK0xjhtQ/+MHW0ri82htGirQAToz1uy2k7K0rah5R3R
-4jUe3AWB3VCdFDpjlCdLWWpw0pv2Nfr0f/89HsWaLf9DDwk5HzeCiEO9a3gPMcff
-A7TbTX1P8/XEQQRSKoZ0FK4hLa1xVJMXedC+yUsc1v9O/brpnoocCgUIuyptZ5LS
-SwEZdECMFBCaJfVL6a7oKFkKE6JyHGguwdRbp9WQY1M1eSr2X1cKmayMHs4ZpQxN
-WRPiMvRU3SmTH8OfTtJ3ge6bAdfZ4RpNMu6bQg==
-=TddI
->>>>>>> 198ed10e9c4c725808e68aeb6885446d6d586f24
+hQIMA2AwAsuYqCfXAQ//blWCbEjK0MvbTlB/V6F2S6TmPdnen0CZ9e7l2Ix5Vkd7
+MdUiNVZoIp2dbkw/3S3dxh+v1koMrfuzV4vdRhF0kZyrX4RLRkTQP0B9q8OJYPre
+6NY7VS4WWQpiRT4qiFgsMsVvdZp2vqHmVHp2fRwWl3cMNkWNSuBNMoT8a2wA3bMi
+4r0RIdKDVa7jM9+g4TwbnuQ0z9jR3NqFMk4lKs7NeRMbg6AotyimKEbm+qbpKxnA
+00GeGdV/CbiDfwEUKh+UYLLrD1p9thCsJkO64uVyskmcZHT49k+PXUieESLDSpOP
+7nPmS9dGsPmsBmpI2MDei8EEN+6ALdlrxd7FQHc7FTOVOPwLPawS3FKF0GPxDdfq
+gW50KFq9lm42wZdcNoai5kLgYlVoyf1WnA7wiIi8pPQZKjSgcLm6mCAV+hehF9vf
+t2FUoNx6cMI4+eMWEaoK9lPpVe1Ejxac1NZJCTZt9dqjL6sjZB4h/O9PEPzaJWn7
+O4DbUx+GkiFWYdETa9C1Dhy1fuA12CPGqbM1DP92bCCQXnG3dfjR3AVWbQ4RcjdX
+BFE2blsQuP4+/d0DjJdY645wb/m9WS02TYgHuENVXq9LZ5OV3Es6g7xSSEVHhp3a
+TN2RPwna2YPjCC45wcqXFdfkT3bQFogOjdYQgWWj1S3PPyI/5+D4aAKqJjNYPu3S
+SwH0IjgFdLIBxjm9DJm4u47MKQ3jDFczYIgRl/BrgdldTjTDjQkIP/GyCFv9ODHH
+tp3zYiJJLuls3RBiUgqzZvLE1Hw/eIHt/CtVMQ==
+=hmGk
-----END PGP MESSAGE-----