Merge commits and resolve conflits

This commit is contained in:
Bob Sun 2017-03-02 15:32:11 +08:00
commit f3497cdc0f
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
3 changed files with 28 additions and 17 deletions

View file

@ -309,8 +309,8 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
footerLabel.numberOfLines = 0
footerLabel.font = UIFont.preferredFont(forTextStyle: .footnote)
footerLabel.textColor = UIColor.gray
let dateString = PasswordStore.shared.getLatestCommitDate(filename: (passwordEntity?.path)!)
footerLabel.text = "Last Updated: \(dateString ?? "Unknown")"
let dateString = PasswordStore.shared.getLatestUpdateInfo(filename: (passwordEntity?.path)!)
footerLabel.text = "Last Updated: \(dateString)"
view.addSubview(footerLabel)
return view
}