Skip to content

Commit 35a9159

Browse files
committed
Conflict resolution
Resolved conflicts after executing rebase. README and all-contributorsrc changes.
1 parent 960471b commit 35a9159

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.all-contributorsrc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@
2727
"avatar_url": "https://avatars0.githubusercontent.com/u/19507241?v=4",
2828
"profile": "http://krushiraj.github.io",
2929
"contributions": [
30-
"code",
31-
"doc"
30+
"code"
3231
]
3332
}
3433
],
3534
"contributorsPerLine": 7
36-
}
35+
}

Readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Coderplex Donation Page
22

3-
[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-)
3+
[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors-)
44

55
Coderplex Foundation is a registered non-profit organization that is working towards improving the state of tech in India.
66

@@ -22,7 +22,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
2222
<table>
2323
<tr>
2424
<td align="center"><a href="https://www.vinaypuppal.com/"><img src="https://avatars1.githubusercontent.com/u/8843216?v=4" width="100px;" alt="vínαч puppαl"/><br /><sub><b>vínαч puppαl</b></sub></a><br /><a href="https://github.com/coderplex/donation-page/commits?author=vinaypuppal" title="Code">💻</a> <a href="https://github.com/coderplex/donation-page/commits?author=vinaypuppal" title="Documentation">📖</a> <a href="#design-vinaypuppal" title="Design">🎨</a></td>
25-
<td align="center"><a href="http://krushiraj.github.io"><img src="https://avatars0.githubusercontent.com/u/19507241?v=4" width="100px;" alt="Krushi Raj Tula"/><br /><sub><b>Krushi Raj Tula</b></sub></a><br /><a href="https://github.com/coderplex/donation-page/commits?author=krushiraj" title="Code">💻</a> <a href="https://github.com/coderplex/donation-page/commits?author=krushiraj" title="Documentation">📖</a></td>
25+
<td align="center"><a href="http://krushiraj.github.io"><img src="https://avatars0.githubusercontent.com/u/19507241?v=4" width="100px;" alt="Krushi Raj Tula"/><br /><sub><b>Krushi Raj Tula</b></sub></a><br /><a href="https://github.com/coderplex/donation-page/commits?author=krushiraj" title="Code">💻</a></td>
2626
</tr>
2727
</table>
2828

0 commit comments

Comments
 (0)