Fixed merge conflict.

This commit is contained in:
wildscotsmen
2018-11-01 23:00:15 -04:00
10 changed files with 303 additions and 276 deletions

View File

@@ -1,13 +1,10 @@
import React, { Component } from 'react';
import ViewSightings from '../components/ViewSightings.js';
import Typography from '@material-ui/core/Typography';
class Sighting extends Component {
render() {
return (
<Typography variant='display1' align='center' gutterBottom>
<ViewSightings/>
</Typography>
<ViewSightings/>
);
}
}