Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into favorite-trans
Browse files Browse the repository at this point in the history
  • Loading branch information
mackhankins committed Aug 12, 2016
2 parents 21a35c2 + 45640c4 commit beda1d9
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions js/screens/Table/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -250,15 +250,15 @@ const Table = React.createClass({

<table className='table table-condensed table-hover display' id='pokemon-data'>
<thead>
<tr>
<th></th>
<th width='18%'>Pokédex #</th>
<th>Sprite</th>
<th>Name</th>
<th>Count</th>
<th>Candy</th>
<th>Evolves</th>
</tr>
<tr>
<th></th>
<th width='18%'>Pokédex #</th>
<th>Sprite</th>
<th>Name</th>
<th>Count</th>
<th>Candy</th>
<th>Evolves</th>
</tr>
</thead>
</table>
</div>
Expand Down Expand Up @@ -416,4 +416,4 @@ const Table = React.createClass({
}
})

export default Table
export default Table

0 comments on commit beda1d9

Please sign in to comment.