now the mystatus page isn't showing up for me at all on my local site


On Thu, Feb 28, 2013 at 3:14 PM, BENJAMIN COLLINS <bsc9718@g.rit.edu> wrote:

> alright thanks. resolved
>
>
>
> On Thu, Feb 28, 2013 at 2:36 PM, Reggie Pierce <notifications@github.com>wrote:
>
>> In hdata/hstatus/mystatus.tpl.php:
>>
>> > +$num_elm=count($points);
>> > +$html_table='<table>
>> > +			<thead>
>> > +				<tr><td>Explanation</td>
>> > +				<td>Status</td>
>> > +				<td>Points</td>
>> > +				<td>Date Submitted</td>
>> > +				</tr>
>> > +			</thead>
>> > +			<tbody>';
>> > +foreach($points as $value)
>> > +{	
>> > +	$html_table .='<tr><td>'.$value['explanation']. '</td>
>> > +					<td>' .$value['approved'] .'</td>
>> > +					<td>' .$value['numPoints'] .'</td>
>> > +					<td>' .$value['submittedTime'] .'</td>
>>
>> You did pull if there are merge conflicts. You just need to resolve them.
>> http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflicts
>>
>> —
>> Reply to this email directly or view it on GitHub<https://github.com/regdoug/rithonors-hstatus/pull/29/files#r3194479>
>> .
>>
>
>