Skip to content
This repository was archived by the owner on Mar 2, 2022. It is now read-only.

Commit c75c72c

Browse files
committed
Conflict resolved
2 parents 2fd8011 + db09915 commit c75c72c

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,18 @@ Useful articles and learning resources.
117117
- [CSS Tricks](https://css-tricks.com) - CSS related posts
118118
- [DEV.to](https://dev.to) - The All in One Blogs Portal for Developers
119119
<<<<<<< HEAD
120-
- [The modern way to learn javascript](https://javascript.info/) - A great place to learn javascript in an easy and understandable way
120+
<<<<<<< HEAD
121+
=======
121122
=======
123+
>>>>>>> db0991564823159c77b58d97a61aa501597787df
122124
- [LogRocket Blog](https://blog.logrocket.com/) - For Frontend Developers and Web App Engineers
123125
- [Hashnode](https://hashnode.com/) - A one-stop platform to start blogging as a developer.
124126
- [Codepen Blog](https://blog.codepen.io/) - A blog about the ins and outs of running a web software business.
125127
- [Airbnb Engineering Blog](https://airbnb.io/) - A blog about Airbnb's Engineering and Data Science Structure
128+
<<<<<<< HEAD
126129
>>>>>>> upstream/master
130+
=======
131+
>>>>>>> db0991564823159c77b58d97a61aa501597787df
127132
</details>
128133
129134
<details>

0 commit comments

Comments
 (0)