fix merge

Quarx2k · Jun 15, 2012 · aa723c9 · aa723c9
1 parent 45ca3d0
commit aa723c9
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -2764,16 +2764,14 @@
     <!-- Advanced tethering settings -->
     <string name="tethering_advanced_text">Advanced</string>
     <string name="tethering_lease_time_text">DHCP lease time</string>
-<<<<<<< HEAD
-=======
+
     <string name="dhcp_lease_30mn">30 minutes</string>
     <string name="dhcp_lease_1h">1 hour (default)</string>
     <string name="dhcp_lease_2h">2 hours</string>
     <string name="dhcp_lease_4h">4 hours</string>
     <string name="dhcp_lease_6h">6 hours</string>
     <string name="dhcp_lease_12h">12 hours</string>
     <string name="dhcp_lease_24h">24 hours</string>
->>>>>>> cyanogen/ics
 
     <!-- Wireless controls, item title to go into the network settings -->
     <string name="network_settings_title">Mobile networks</string>