diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-11 20:04:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-11 20:04:55 -0400 |
| commit | eba2d3d2cd7337868ba9601f5aba0ff3f9392bb9 (patch) | |
| tree | faf020ef359b2496ddf9ddd1c5c0d7644fbd024b /privdata | |
| parent | 08ff95fbfaf867ad5a6acdecfd0eb1e84ed44fd9 (diff) | |
| parent | e7d2c38a59c8ffed26da04e7e46d1ebbdfe08c5e (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata/privdata.gpg
Diffstat (limited to 'privdata')
| -rw-r--r-- | privdata/privdata.gpg | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/privdata/privdata.gpg b/privdata/privdata.gpg deleted file mode 100644 index 7adbfa93..00000000 --- a/privdata/privdata.gpg +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN PGP MESSAGE----- -Version: GnuPG v1 - -hQIMA7ODiaEXBlRZAQ/+PM/KTUaI4xdM+eDaiund1opYfCFjcwPoXcvj56pahV4D -3P7EYYhd1tAYaj4dGiPPNCN6bp6Azajhggu2CEm0VBCGGKIxo5p20rlITwVCgVHa -Y9JRhh6A8t0e34fSOFFfaBBRDF377Y6sWuJ/deo3h/OhmJyOwSBVANwqBdQVOSza -LLnsZ2utkHgnXjS1hb54IglG0MAgU3ynYCDg6H+v1ZJ/qHH1hK5FINYVQ7cs60ZR -S1VdJObt11jHr72C2804bJpWWK0//cE3BV5wzugRopfBorhdoPlqaQ81aqD3TkYa -1nthyjA/E9TnU15M8WTkgfDRFYa/mcrvTLNd+MIRSV0wwIy0kBvRvQYBLV276Sdb -cr1nk91q2KwwnDoymlZyKN0v2Ax9lq16QKrW+hLHFlnOs7OjzUGNvaog/Q9P25Yu -Q+/WkP9ToN6UvkGFV10ItL8cttt9W8kFMFIzTXLX65f2s14+pKBX1M0xhDVhEEJp -BscOW/gIcOoINUBbQqTSMMjUV6bIxmyNXKw2kTwvtqtbd+fRN6kBMYVeJ6JQK2gx -ANXVd+Xs1r1dOGnQ469mUX1gkc4dByUa1eI8QQLoFPKpTkmpJngjzD7izhyW+v2m -GWPHHdS2F1xhzwLWxsh8fZ5NHkUTnIZqKfMacLWqKY7omUNNFPd9/W4c96M0D5bS -fgGcrlNnNQLNdCKysU9jdc4Y3bEVoGA9mSUhhzBpyC0XAo/7dm34rBlXWHl6v8jx -hr9vdV/g6QxCr8qjnndsTqCd2hwk/+1IXoKctzxWFYtv8fxv7UNDir9sCtovLamH -fyTU0AeA4ignXssxQH5PHbQCaUcVO12lp7RAR6vuvg== -=nkRo ------END PGP MESSAGE----- |