Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
ikiwiki_da_admin.setup.
|
|
ikiwiki_nb_admin.config.
|
|
Conflicts (resolve manually):
ikiwiki_nb.setup
|
|
Conflicts (resolved manually):
ikiwiki_da.setup
|
|
gitignore them.
|
|
|
|
|
|
|
|
Conflicts:
basewiki
templates
|
|
Conflicts:
basewiki
templates
|
|
|
|
Conflicts:
basewiki
templates
|
|
Conflicts:
basewiki
templates
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
Conflicts: (manually resolved)
.gitignore
Makefile
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
Makefile (manually resolved)
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
Makefile (manually resolved)
|
|
Conflicts:
Makefile (manually resolved)
|
|
|
|
|
|
|
|
Conflicts:
Makefile (resolved manually)
|