summaryrefslogtreecommitdiffhomepage
path: root/file.erb
diff options
context:
space:
mode:
authorLevi Bostian <levi.bostian@gmail.com>2013-09-20 22:16:01 -0500
committerLevi Bostian <levi.bostian@gmail.com>2013-09-20 22:16:01 -0500
commitf471616ccb97e5fd32393f1f408394cfebe0d151 (patch)
treeb0d6618bcf07a9f91d7e17ae48b8a8aa28eb0065 /file.erb
parent35909645f2dbfedc38b566ec9838c2202cd51e3c (diff)
Remove .orig file created during merge.
Diffstat (limited to 'file.erb')
0 files changed, 0 insertions, 0 deletions