From 27a55e18e3f1d7f84077baeb6d20be5e8657a18e Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sun, 13 Sep 2009 06:40:22 +0000
Subject: Remove conflicting id from Colors layout

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@412 df292f66-193f-0410-a5fc-6d59da041ff2
---
 AndroidManifest.xml       | 2 +-
 res/layout/act_colors.xml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6a2b063..1d9d284 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.connectbot"
 	android:versionName="1.6-dev"
-	android:versionCode="199">
+	android:versionCode="200">
 	
 	<application
 		android:icon="@drawable/icon"
diff --git a/res/layout/act_colors.xml b/res/layout/act_colors.xml
index f399c7a..96fe218 100644
--- a/res/layout/act_colors.xml
+++ b/res/layout/act_colors.xml
@@ -46,7 +46,6 @@
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content"
 		android:layout_toLeftOf="@+id/bg"
-		android:id="@+id/fg_label"
 		android:paddingTop="12dp"
 		/>
 
-- 
cgit v1.2.3