Skip to content

Commit 63a9df0

Browse files
authored
Merge pull request #8 from dempah14/Saundras-branch
Saundras branch
2 parents 994876c + 9535706 commit 63a9df0

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

‎src/components/app.js‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,26 @@
11
import React, { Component } from 'react';
22
import Alex from './alex'
3-
<<<<<<< HEAD
4-
<<<<<<< HEAD
3+
import Saundra from './saundra'
4+
55
import Landon from './landon'
6-
=======
7-
=======
86
import Paola from './Paola'
9-
>>>>>>> 96a75e9d6dc1b4afe2dc0a8aa432e6c65d93c573
107
import Jared from './jared'
118
import Josh from './josh'
12-
>>>>>>> f6eb50240b5e773dd29bb94a75e5f37a41db9347
139

1410
class App extends Component {
1511
render() {
1612
return (
1713
<div>
1814
<h1>React Simple Starter</h1>
1915
<Alex />
20-
<<<<<<< HEAD
21-
<<<<<<< HEAD
16+
<Saundra />
2217
<Landon />
23-
=======
24-
=======
2518

2619
<Paola/>
2720

28-
>>>>>>> 96a75e9d6dc1b4afe2dc0a8aa432e6c65d93c573
2921
<Jared />
3022

3123
<Josh/>
32-
>>>>>>> f6eb50240b5e773dd29bb94a75e5f37a41db9347
3324
</div>
3425
);
3526
}

‎src/components/saundra.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import React, { Component } from 'react';
2+
3+
export default class Saundra extends Component {
4+
render() {
5+
return (
6+
<div>Saundra</div>
7+
);
8+
}
9+
}

0 commit comments

Comments
 (0)