diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-21 22:24:48 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-10-21 22:24:48 -0400 |
| commit | 8d9be2536db7ce5994bab5448f8466d2da305d3c (patch) | |
| tree | 4ba2ec69fa3d19ce29ea7073b6e28e8a0a58a3a9 /xsession | |
| parent | 9b1c2784b1f3b0ac101c99a614594c69f3178e5f (diff) | |
Remove merge markers.
Diffstat (limited to 'xsession')
0 files changed, 0 insertions, 0 deletions