From: Richard Beales Date: Wed, 20 Mar 2013 16:59:19 +0000 (+0000) Subject: fix merge conflict with stylesheet tags X-Git-Tag: 1.7.5~29^2~5 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=77accf45df3072bf0e3fe1e919bb75fc14313119;p=tt-rss.git fix merge conflict with stylesheet tags --- 77accf45df3072bf0e3fe1e919bb75fc14313119 diff --cc index.php index 840959a1,6d9608a3..8cb73777 --- a/index.php +++ b/index.php @@@ -55,10 -53,11 +53,11 @@@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - Tiny Tiny RSS + <?php echo PAGE_TITLE ?> - - - + + + + diff --cc prefs.php index 0b9cb3cf,cda53751..55a8d3af --- a/prefs.php +++ b/prefs.php @@@ -25,9 -23,10 +23,10 @@@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - Tiny Tiny RSS : <?php echo __("Preferences") ?> + <?php echo PAGE_TITLE ?> : <?php echo __("Preferences") ?> - - + + +