| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1163,7 +1163,7 @@ |
| 1164 | 1164 | $wgOut->setArticleRelated( true ); |
| 1165 | 1165 | |
| 1166 | 1166 | if ( $this->isConflict ) { |
| 1167 | | - $wgOut->addWikiMsg( 'explainconflict' ); |
| | 1167 | + $wgOut->wrapWikiMsg( "<div class='mw-explainconflict'>\n$1</div>", 'explainconflict' ); |
| 1168 | 1168 | |
| 1169 | 1169 | $this->textbox2 = $this->textbox1; |
| 1170 | 1170 | $this->textbox1 = $this->getContent(); |