From 24b92172be818c7ee67a235ad8403f01a4495987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 May 2016 15:18:53 +0300
Subject: Fix license header

---
 .../java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java | 3 ---
 1 file changed, 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
-- 
cgit v1.2.3