Skip to content

Commit 33e3cf7

Browse files
authored
Merge pull request #212 from codeuino/development
improved website
2 parents fb8b847 + f165cca commit 33e3cf7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2306
-1047
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
node_modules/
22
.DS_Store
33
ngrok
4+
build/

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@ 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
6768
### Opening a pull request
69+
=======
70+
## Opening a pull request
71+
>>>>>>> ab1812d... prettified readme.md with cool badges
6872
6973
[![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)
7074

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

7781
## Credits
7882

83+
<<<<<<< HEAD
7984
This project is currently maintained by [Jaskirat Singh](https://github.com/jaskirat2000) .
85+
=======
86+
---
87+
88+
[![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

0 commit comments

Comments
 (0)