makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-30 15:18:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

correctly display diff for conflicts

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10156 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-09-17 08:13:28 +00:00
parent 8bcfd33539
commit 6b5d195a98
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/adm/style/install_update_diff.html
View file

@ -237,6 +237,10 @@ table.hrdiff caption span {
<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" /> <input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
</fieldset> </fieldset>
</form> </form>
<!-- ENDIF -->
<!-- IF S_DIFF_CONFLICT_FILE -->
<div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
<br style="clear: both;" />
<!-- ENDIF --> <!-- ENDIF -->
</div> </div>
@ -246,10 +250,6 @@ table.hrdiff caption span {
<span class="corners-top"><span></span></span> <span class="corners-top"><span></span></span>
<div id="diff_content"> <div id="diff_content">
<div id="main"> <div id="main">
<!-- IF S_DIFF_CONFLICT_FILE -->
<div style="float: {S_CONTENT_FLOW_END};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
<!-- ENDIF -->
{DIFF_CONTENT} {DIFF_CONTENT}
</div> </div>
</div> </div>