Fix license header

2016-05-25 15:18:53 +03:00
parent 6e4db2c305
commit 24b92172be
1 changed files with 0 additions and 3 deletions
--- 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