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

Merge branch 'master' of https://github.com/Hutchy68/pivot

Browse Source 
Conflicts:
	pivot.php
This commit is contained in:
Tom Hutchison 2015-11-03 21:22:53 -05:00
commit 033aca2dae
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pivot.php
View File

@ -5,7 +5,7 @@
* *
* @file * @file
* @ingroup Skins * @ingroup Skins
* @author Garrick Van Buren, Jamie Thingelstad * @author Garrick Van Buren, Jamie Thingelstad, Tom Hutchison
* @license 2-clause BSD * @license 2-clause BSD
*/ */
@ -23,7 +23,11 @@ $wgExtensionCredits['skin'][] = array(
'Tom Hutchison', 'Tom Hutchison',
'...' '...'
), ),
<<<<<<< HEAD
'version' => '1.0.0 rc', 'version' => '1.0.0 rc',
=======
'version' => '1.0.0 rc-1',
>>>>>>> a15db36587f26f9360de0f80312f95b9171ae7dd
'descriptionmsg' => 'pivot-desc' 'descriptionmsg' => 'pivot-desc'
); );