-- 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 -->
	</div>

	<div id="page-body">
		<div id="acp">
		<div class="panel" id="codepanel">
			<span class="corners-top"><span></span></span>
				<div id="diff_content">
					<div id="main">
						{DIFF_CONTENT}
					</div>
				</div>
			<span class="corners-bottom"><span></span></span>
		</div>
		</div>
	</div>


<!-- INC