add place to work on merge
commit2094fb14faa5c164d5dfeb5eb9300ebd7fee10a6
authorJoseph Corneli <holtzermann17@gmail.com>
Sun, 25 Jun 2017 19:36:22 +0000 (25 20:36 +0100)
committerJoseph Corneli <holtzermann17@gmail.com>
Sun, 25 Jun 2017 19:36:22 +0000 (25 20:36 +0100)
tree8e57ee390af3dccacb86e7200ad56e437ded7449
parent04428338aa38dc30fdc59f9636cdc15cf6595603
add place to work on merge
elisp/honey.el
elisp/simple-ui.el
latex/arxana-merge.tex [new file with mode: 0644]
latex/sbdm4cbpp.tex
org/arxana-redux.org
org/farm-refs.bib