summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorRyan Mitchell <rmitch@onprem.com>2017-12-20 21:19:45 -0600
committerJack Humbert <jack.humb@gmail.com>2017-12-20 22:27:09 -0500
commit3b9e4967b89383307e00cbcb05061d3a1830c07e (patch)
tree69b9fb2c13ce5b5f3ce838c52b5d5192c244b01d /quantum
parent7c57104b51903bfb1f7e35a5195222e13def7557 (diff)
fix breaking build: remove merge conflict text
Diffstat (limited to 'quantum')
0 files changed, 0 insertions, 0 deletions