diff options
author | William Carroll <wpcarro@gmail.com> | 2019-12-22T20·58+0000 |
---|---|---|
committer | William Carroll <wpcarro@gmail.com> | 2019-12-24T15·21+0000 |
commit | 3dc1bc4f841042eda9b8d17a97ff6e7b714c881a (patch) | |
tree | a0ed625dc0e692e3c50beb353f9e51b5972044c7 /configs/shared/.emacs.d/opam-user-setup.el | |
parent | 7adb77692752ab0225a5eeee14bde095596f7c04 (diff) |
Delete "conflicted copy" files
TODO: It may be preferable to augment my git history to remove the traces of these files ever existing. For now, since I value a precise git history over a pristine git history and my tendancy to maintain the former is sometimes at odds with my goal of the latter, I'm saving this work for a later date.
Diffstat (limited to 'configs/shared/.emacs.d/opam-user-setup.el')
0 files changed, 0 insertions, 0 deletions