diff options
| author | Micah Anderson <micah@riseup.net> | 2014-02-25 10:19:37 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2014-02-25 10:19:37 -0500 |
| commit | e26ab33e73d6957f1a5631cd4e7564a7f1849bbb (patch) | |
| tree | 3bfc1521386b6c6c16ac4b285b6fbf8858907dd5 /manifests/file | |
| parent | 15757eb2334e614bc90c8d5235834352f72261e4 (diff) | |
fix merge conflict snafu introduced by:
115691c87bad3f5863f088e73603133b67c9f828
this fixes the incorrectly nested case statement, and brings back the
lost 'config file as link' changes
Diffstat (limited to 'manifests/file')
0 files changed, 0 insertions, 0 deletions