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

Conflicts: pivot.php
2015-11-03 21:22:53 -05:00 · 2015-11-03 21:22:53 -05:00 · 033aca2dae
parent 25daa36056 a15db36587
commit 033aca2dae
1 changed files with 5 additions and 1 deletions
--- a/pivot.php
+++ b/pivot.php
@ -5,7 +5,7 @@
 *
 * @file
 * @ingroup Skins
- * @author Garrick Van Buren, Jamie Thingelstad
+ * @author Garrick Van Buren, Jamie Thingelstad, Tom Hutchison
 * @license 2-clause BSD
 */

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