diff options
author | Urbain Vaes <urbain@vaes.uk> | 2015-07-31 00:46:29 +0200 |
---|---|---|
committer | Urbain Vaes <urbain@vaes.uk> | 2015-07-31 00:46:29 +0200 |
commit | 5d7ca8ca2370b4c7ba5b9c7c0dc17678a14e595e (patch) | |
tree | 3adeed75d212d48d5ac922031bf4f40716c20316 /passwords | |
parent | 2308be27935c17417607fd64721205d1c9666626 (diff) | |
parent | c47cfa237965c289d6843bfc6c1e2bcb642803ad (diff) |
Merge branch 'master' of github.com:uvaes/dotfiles
Conflicts:
passwords/main.asc
repos.zsh
vim/.netrwhist
xmodmap
Diffstat (limited to 'passwords')
-rw-r--r-- | passwords/main.asc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/passwords/main.asc b/passwords/main.asc index 1594783..b8ff442 100644 --- a/passwords/main.asc +++ b/passwords/main.asc @@ -1,6 +1,7 @@ -----BEGIN PGP MESSAGE----- Version: GnuPG v1 +<<<<<<< HEAD hQIMA2AwAsuYqCfXAQ//Rh9CxPBXFCTJWb50Leo+ajlLyNp24f18iKgHajWCWl+L LnHZULza+gGDCZ0nCx5j0R8KLLmzBm7OtHQeinGt6GA5hn6eswjHUhRK5JJmmaU/ 0YICerPyxAMwb/ilseH9dzyJEWsfh37vK8+ErxlsaOSDseWTGpI9rSAo2jUucx3C @@ -15,4 +16,20 @@ x+42TjozDOkOsyikW+wVCWl6K32SgVREXeBhG1t9Z1QQCdHKWNi/oc5lreisX+co 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 -----END PGP MESSAGE----- |