Age | Commit message (Collapse) | Author |
|
Conflicts:
Makefile (manually resolved)
|
|
|
|
|
|
|
|
Conflicts:
Makefile (manually resolved)
|
|
|
|
Conflicts:
Makefile (resolved manually)
|
|
|
|
|
|
multi-layered Gits).
|
|
gitignore them.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki_admin.setup
ikiwiki_da_admin.setup
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki_da.setup
|
|
Conflicts (manually resolved):
ikiwiki_da_admin.setup
|
|
Conflicts (manually resolved):
ikiwiki_da.setup
|
|
|
|
|