Skip to content

Commit e6a6cfa

Browse files
authored
fix typos (#217)
PR# 217 - Minor changes to Readme - some typos fixed
1 parent e0482ce commit e6a6cfa

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

README.md

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Codeuino Website
22

3-
Offical site for Codeuino landing page. Please visit [http://www.codeuino.org/](http://www.codeuino.org/)
3+
Official site for Codeuino landing page. Please visit [http://www.codeuino.org/](http://www.codeuino.org/)
44

55
## Table of contents
66

@@ -64,11 +64,7 @@ If you see an open issue that you want to tackle, comment on the issue to let pe
6464
If an issue was opened a while ago, it’s possible that it’s being addressed somewhere else, or has already been resolved, so comment to ask for confirmation before starting work.
6565
If you opened an issue, but figured out the answer later on your own, comment on the issue to let people know, then close the issue. Even documenting that outcome is a contribution to the project.
6666

67-
<<<<<<< HEAD
6867
### Opening a pull request
69-
=======
70-
## Opening a pull request
71-
>>>>>>> ab1812d... prettified readme.md with cool badges
7268

7369
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?logo=github)](http://makeapullrequest.com) ![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/codeuino/website-www.codeuino.org?logo=git&logoColor=white) ![GitHub contributors](https://img.shields.io/github/contributors/codeuino/website-www.codeuino.org?logo=github)
7470

@@ -80,10 +76,7 @@ A pull request doesn’t have to represent finished work. It’s usually better
8076

8177
## Credits
8278

83-
<<<<<<< HEAD
8479
This project is currently maintained by [Jaskirat Singh](https://github.com/jaskirat2000) .
85-
=======
8680
---
8781

8882
[![Twitter Follow](https://img.shields.io/twitter/follow/codeuino?style=social)](https://twitter.com/codeuino) [![Open Source Love](https://badges.frapsoft.com/os/v2/open-source.svg?v=103)](https://github.com/codeuino/Social-Platform-Donut)
89-
>>>>>>> ab1812d... prettified readme.md with cool badges

src/pages/Home/Components/Projects.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ const Projects = () => {
183183
<h3 className="project-design-heading">Design Project</h3>
184184
<h6 className="project-design-text">COMING SOON</h6>
185185
<p>
186-
To all the designers in the world something big is comming soon!
186+
To all the designers in the world something big is coming soon!
187187
Update your tools for the battle.
188188
</p>
189189
</Col>

0 commit comments

Comments
 (0)