diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-05-11 10:10:26 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-05-11 10:10:26 +0200 |
| commit | e7923336fb146c90d14ee0ccb3c164017bd3aef6 (patch) | |
| tree | ee568b2917db7944740b7522bf758644de484c47 /phpBB/posting.php | |
| parent | 0bc5e951987ff77b2f1611981fcdb33efcc55ad6 (diff) | |
| download | forums-e7923336fb146c90d14ee0ccb3c164017bd3aef6.tar forums-e7923336fb146c90d14ee0ccb3c164017bd3aef6.tar.gz forums-e7923336fb146c90d14ee0ccb3c164017bd3aef6.tar.bz2 forums-e7923336fb146c90d14ee0ccb3c164017bd3aef6.tar.xz forums-e7923336fb146c90d14ee0ccb3c164017bd3aef6.zip | |
[ticket/12407] Remove merge marker from posting.php
PHPBB3-12407
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 1 |
1 files changed, 0 insertions, 1 deletions
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 |