commit insert removed

2015-11-03 21:44:16 -05:00 · 2015-11-03 21:44:16 -05:00 · 9020d4c670
parent 0b897ceb0a
commit 9020d4c670
1 changed files with 0 additions and 2 deletions
--- a/pivot.php
+++ b/pivot.php
@ -23,11 +23,9 @@ $wgExtensionCredits['skin'][] = array(
 		'Tom Hutchison',
 		'...'
 		),
-<<<<<<< HEAD
 	'version' => '1.0.0 rc',
 =======
 	'version' => '1.0.0 rc-1',
->>>>>>> a15db36587f26f9360de0f80312f95b9171ae7dd
 	'descriptionmsg' => 'pivot-desc'
 );