Remove forgotten merge cruft.
authorJennifer Richards <jennifer@painless-security.com>
Thu, 13 Oct 2016 20:59:28 +0000 (16:59 -0400)
committerJennifer Richards <jennifer@painless-security.com>
Thu, 13 Oct 2016 20:59:28 +0000 (16:59 -0400)
commit01f4563ebc1c802ff7e3a29935744b61466e38e9
tree1e5e69c2f028280fd58769ded579b6fe2b0a688b
parent8b5e818ea1b2b46225fc517bfc0ed6c253bcd9b2
Remove forgotten merge cruft.
common/tr_rp.c