Removing some merge remnants.
authorSam Boyer
Tue, 7 Sep 2010 20:12:52 +0000 (20:12 +0000)
committerSam Boyer
Tue, 7 Sep 2010 20:12:52 +0000 (20:12 +0000)
commit64a09c462a76e9c0626744ba98286b8a71f88761
tree406401ebb48444fee93d332a34dc48737480db21
parentaeed3fefe9a089b7b38824389559f9d3e38a94d2
Removing some merge remnants.
includes/context.inc
js/ajax-responder.js
plugins/content_types/search/search_result.inc