diff --git a/phpBB/posting.php b/phpBB/posting.php
index 345b5b094e..d48157dcd6 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1572,7 +1572,6 @@ $page_data = array(
 *				post|reply|quote|edit|delete|bump|smilies|popup
 * @var	string	page_title	Title of the mode page
 * @var	bool	s_topic_icons	Whether or not to show the topic icons
-<<<<<<< HEAD
 * @var	string	form_enctype	If attachments are allowed for this form
 *				"multipart/form-data" or empty string
 * @var	string	s_action	The URL to submit the POST data to