mirror of
https://github.com/thangisme/notes.git
synced 2025-05-16 21:18:27 -04: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