summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-05-25 12:18:53 (GMT)
committer Dominik Schürmann <dominik@dominikschuermann.de>2016-05-25 12:18:53 (GMT)
commit24b92172be818c7ee67a235ad8403f01a4495987 (patch)
tree4ce8376fc9e5f1c1d861de3e487174c8d6ff5012
parent6e4db2c3050066e926c07319b94a60388eb3bfcd (diff)
downloadopen-keychain-24b92172be818c7ee67a235ad8403f01a4495987.zip
open-keychain-24b92172be818c7ee67a235ad8403f01a4495987.tar.gz
open-keychain-24b92172be818c7ee67a235ad8403f01a4495987.tar.bz2
Fix license header
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java3
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 48bbd2b..e1f9033 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