Permalink
Browse files

Fix breakage from previous merge

  • Loading branch information...
daniel-kristjansson committed May 5, 2012
1 parent 4a0ce10 commit fcfd8e27fdc3a32f825ba346faf43f422440b876
Showing with 0 additions and 5 deletions.
  1. +0 −5 mythtv/libs/libmythui/myththemedmenu.cpp
@@ -896,13 +896,8 @@ bool MythThemedMenu::checkPinCode(const QString &password_setting)
QDateTime last_time = MythDate::fromString(last_time_stamp);
if (!last_time.isValid() || last_time.secsTo(curr_time) < 120)
{
-<<<<<<< HEAD
last_time_stamp = MythDate::toString(
curr_time, MythDate::kDatabase);
- GetMythDB()->SetSetting(timestamp_setting, last_time_stamp);
-=======
- last_time_stamp = curr_time.toString(Qt::TextDate);
->>>>>>> master
GetMythDB()->SaveSetting(timestamp_setting, last_time_stamp);
return true;
}

0 comments on commit fcfd8e2

Please sign in to comment.