dotfiles

Unnamed repository; edit this file 'description' to name the repository.
git clone git://edryd.org/dotfiles
Log | Files | Refs
commit 00999d2ca688cfce800bb4dc78c8c72e99a9f04e
parent bf524714d123d849e2ca218def2035b0759e1c66
Author: Ed van Bruggen <edvb54@gmail.com>
Date:   Wed, 23 Sep 2015 18:11:30 -0700

Merge branch 'master' of https://github.com/edvb54/dotfiles

Conflicts:
	vimrc