Resolves merge conflict

This commit is contained in:
Athitya 2017-07-07 20:29:24 +05:30
commit b554d94b37

View file

@ -12,7 +12,7 @@ A Ruby script that colorizes the `ls` output with color and icons. Here are the
# Table of contents
- [Usage](#usage)
- [Installatation](#installation)
- [Installation](#installation)
- [Recommended configurations](#recommended-configurations)
- [Updating](#updating)
- [Uninstallation](#uninstallation)