ch0ic3/awesome
1
0
Fork 0
mirror of https://github.com/sindresorhus/awesome.git synced 2024-12-25 02:15:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed merge conflicts from upstream

Browse Source 
Conflicts:
	readme.md
This commit is contained in:
Trent Oswald 2015-03-02 09:03:47 -07:00
commit 5e89246ff0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
readme.md
View File

@ -97,6 +97,7 @@
- [Algorithms](https://github.com/tayllan/awesome-algorithms) - [Algorithms](https://github.com/tayllan/awesome-algorithms)
- [Algorithm Visualizations](https://github.com/enjalot/algovis) - [Algorithm Visualizations](https://github.com/enjalot/algovis)
- [Artificial Intelligence](https://github.com/owainlewis/awesome-artificial-intelligence) - [Artificial Intelligence](https://github.com/owainlewis/awesome-artificial-intelligence)
- [Search Engine Optimization](https://github.com/marcobiedermann/search-engine-optimization)
## Miscellaneous ## Miscellaneous
@ -140,6 +141,7 @@
- [Learn to Program](https://github.com/karlhorky/learn-to-program) - [Learn to Program](https://github.com/karlhorky/learn-to-program)
- [Boilerplate Projects](https://github.com/melvin0008/awesome-projects-boilerplates) - [Boilerplate Projects](https://github.com/melvin0008/awesome-projects-boilerplates)
- [Design and Development Guides](https://github.com/NARKOZ/guides) - [Design and Development Guides](https://github.com/NARKOZ/guides)
- [Useful .htaccess Snippets](https://github.com/phanan/htaccess)
- [CLI Workshoppers/Adventures](https://github.com/therebelrobot/awesome-workshopper) - [CLI Workshoppers/Adventures](https://github.com/therebelrobot/awesome-workshopper)
## License ## License