aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-01 17:54:53 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-01 17:54:53 +0200
commit0bfac9989f801aa93d8bc336307d60b817995688 (patch)
tree862660bd27a28a14db7d9fa2a52bebaf41b6f57e /OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
parente10cbc54c606563b2d06f083bca17119ca585127 (diff)
parentf72a07690c257fefb28aed6645ad898fded63a78 (diff)
downloadopen-keychain-0bfac9989f801aa93d8bc336307d60b817995688.tar.gz
open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.tar.bz2
open-keychain-0bfac9989f801aa93d8bc336307d60b817995688.zip
Merge branch 'master' into yubikey
Diffstat (limited to 'OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml')
-rw-r--r--OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
index 3454d3668..877ea77db 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
@@ -67,7 +67,7 @@
android:text="@string/label_comment" />
<EditText
- android:id="@+id/comment"
+ android:id="@+id/user_id_item_comment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"