mediawiki/pivot
1
0
Fork 0
mirror of https://github.com/Hutchy68/pivot.git synced 2024-11-21 18:09:03 +01:00
Code Issues Releases Wiki Activity

commit insert removed

Browse Source
This commit is contained in:
Tom Hutchison 2015-11-03 21:44:16 -05:00
parent 0b897ceb0a
commit 9020d4c670
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pivot.php
View File

@ -23,11 +23,9 @@ $wgExtensionCredits['skin'][] = array(
'Tom Hutchison', 'Tom Hutchison',
'...' '...'
), ),
<<<<<<< HEAD
'version' => '1.0.0 rc', 'version' => '1.0.0 rc',
======= =======
'version' => '1.0.0 rc-1', 'version' => '1.0.0 rc-1',
>>>>>>> a15db36587f26f9360de0f80312f95b9171ae7dd
'descriptionmsg' => 'pivot-desc' 'descriptionmsg' => 'pivot-desc'
); );