Compare commits

..

5 Commits

Author SHA1 Message Date
JonathanHerrewijnen
c828016166 Added zooi 2020-02-17 11:21:30 +01:00
JonathanHerrewijnen
04d82e996d Merge branch 'master' of http://192.168.0.150:3000/EljakimHerrewijnen/Ichthus
Simulating merge error
2020-02-17 11:11:40 +01:00
JonathanHerrewijnen
570f94864f simulating merge error 2020-02-17 11:11:29 +01:00
JonathanHerrewijnen
a41ca64752 Merge branch 'master' of http://192.168.0.150:3000/EljakimHerrewijnen/Ichthus
Zorgen dat het werkt
2020-02-17 10:49:00 +01:00
JonathanHerrewijnen
65eb586cf6 Test Drie 2020-02-17 10:42:54 +01:00

View File

@ -8,6 +8,7 @@ export class ChristenZijn extends Component {
<div> <div>
<h1>Christen zijn</h1> <h1>Christen zijn</h1>
<p>Welcome to your new single-page application, built with: Well, React dotnet, and does it really matter?..</p> <p>Welcome to your new single-page application, built with: Well, React dotnet, and does it really matter?..</p>
<p>Zooi</p>
</div> </div>
); );
} }