mirror of
https://github.com/thangisme/notes.git
synced 2025-02-21 06:57:46 -05:00
# Conflicts: # _includes/nav.html # _layouts/default.html # assets/js/search-data.json # docs/configuration.md # lib/tasks/search.rake
# Conflicts: # _includes/nav.html # _layouts/default.html # assets/js/search-data.json # docs/configuration.md # lib/tasks/search.rake