makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12407] Remove merge marker from posting.php

Browse source 
PHPBB3-12407
This commit is contained in:
Marc Alexander 2014-05-11 10:10:26 +02:00
parent 0bc5e95198
commit e7923336fb
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/posting.php
View file

@ -1572,7 +1572,6 @@ $page_data = array(
* post|reply|quote|edit|delete|bump|smilies|popup * post|reply|quote|edit|delete|bump|smilies|popup
* @var string page_title Title of the mode page * @var string page_title Title of the mode page
* @var bool s_topic_icons Whether or not to show the topic icons * @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 * @var string form_enctype If attachments are allowed for this form
* "multipart/form-data" or empty string * "multipart/form-data" or empty string
* @var string s_action The URL to submit the POST data to * @var string s_action The URL to submit the POST data to