diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-25 15:18:53 +0300 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-25 15:18:53 +0300 |
| commit | 24b92172be818c7ee67a235ad8403f01a4495987 (patch) | |
| tree | 4ce8376fc9e5f1c1d861de3e487174c8d6ff5012 | |
| parent | 6e4db2c3050066e926c07319b94a60388eb3bfcd (diff) | |
| download | open-keychain-24b92172be818c7ee67a235ad8403f01a4495987.tar.gz open-keychain-24b92172be818c7ee67a235ad8403f01a4495987.tar.bz2 open-keychain-24b92172be818c7ee67a235ad8403f01a4495987.zip | |
Fix license header
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java index 48bbd2b99..e1f903345 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java @@ -1,8 +1,5 @@ /* -<<<<<<< HEAD * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de> -======= ->>>>>>> development * Copyright (C) 2014 Vincent Breitmoser <v.breitmoser@mugenguild.com> * * This program is free software: you can redistribute it and/or modify |