summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-12-04 15:31:55 -0500
committerTim Graham <timograham@gmail.com>2014-12-04 15:31:55 -0500
commit17c401302858bccfb607b5bade0714328b11cb0d (patch)
treee39f73b8df1be018e635208ba135232511db1db9 /docs/ref
parent8d7a48027ef6848f693f57ae442a1b0ace0ebcdc (diff)
Removed stray conflict line in 1.7.2 release notes.
Diffstat (limited to 'docs/ref')
0 files changed, 0 insertions, 0 deletions