diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-26 15:51:11 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-26 15:51:11 +0000 |
| commit | a43ead8ee7db832871db9cd2c4f294108398f4b0 (patch) | |
| tree | 417710b9e382752ac1f815633e67f73cdc7e3fe0 /phpBB/adm/style/install_update_diff.html | |
| parent | 599a5964c064978b15653b05c4709f2c72943bb2 (diff) | |
| download | forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.tar forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.tar.gz forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.tar.bz2 forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.tar.xz forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.zip | |
do not get too excited
git-svn-id: file:///svn/phpbb/trunk@7954 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style/install_update_diff.html')
| -rw-r--r-- | phpBB/adm/style/install_update_diff.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index 799ca34292..ce1a241abe 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -239,7 +239,7 @@ table.hrdiff caption span { <div id="main"> <!-- IF S_DIFF_CONFLICT_FILE --> - <div style="float: right;"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div> + <div style="float: {S_CONTENT_FLOW_END};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div> <!-- ENDIF --> {DIFF_CONTENT} </div> |