From e7923336fb146c90d14ee0ccb3c164017bd3aef6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 11 May 2014 10:10:26 +0200 Subject: [PATCH] [ticket/12407] Remove merge marker from posting.php PHPBB3-12407 --- phpBB/posting.php | 1 - 1 file changed, 1 deletion(-) 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