about summary refs log tree commit diff
path: root/scalingo.json
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-02-04 17:04:22 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-02-04 17:04:22 -0600
commite815d6803d3e7c607e8bb04a5a14048ab08e6508 (patch)
tree3e4ee2d3511801a806ec7f176b7f26f3e79b464b /scalingo.json
parenta6fb1c58eead1357a307813c69f798f32bcf7cae (diff)
db/schema.rb: resolve erroneously-unresolved conflict
Diffstat (limited to 'scalingo.json')
0 files changed, 0 insertions, 0 deletions