tonyair
/
doc.silverstripe.org
mirror of https://github.com/silverstripe/doc.silverstripe.org
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MINOR: removed conflict information from template 

git-svn-id: http://svn.silverstripe.com/projects/ss2doc/branches/v2@120791 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Will Rossiter 2011-08-11 04:05:38 +00:00
parent db7b9f408b
commit cf51259592
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sapphiredocs/templates/Layout/DocumentationViewer_results.ss
View File

@ -44,13 +44,9 @@
</div>
<div id="sidebar-column">
<<<<<<< HEAD
<!-- needs advanced search options -->
=======
<div class="sidebar-box">
<h4><% _t('ADVANCEDSEARCH', 'Advanced Search') %></h4>
$AdvancedSearchForm
</div>
>>>>>>> origin/master
</div>
</div>