Skip to content

Commit 48f5ba6

Browse files
authored
Merge pull request #3 from dempah14/Joshs-branch
Joshs branch
2 parents 969262a + dbd096a commit 48f5ba6

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

‎src/components/app.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import React, { Component } from 'react';
22
import Alex from './alex'
3-
3+
import Josh from './josh'
44
class App extends Component {
55
render() {
66
return (
77
<div>
88
<h1>React simple starter</h1>
99
<Alex />
10+
<Josh/>
1011
</div>
1112
);
1213
}

‎src/components/josh.js‎

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

0 commit comments

Comments
 (0)