From 5a87b852a72cc36d4d7b64271ed542ce2a1befe0 Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Sat, 23 Jan 2010 15:29:33 +0000
Subject: show conflicts in changes filters. Patch by Lena Herrmann. Closes
 COUCHDB-630

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@902422 13f79535-47bb-0310-9956-ffa450edef68
---
 THANKS | 1 +
 1 file changed, 1 insertion(+)

(limited to 'THANKS')

diff --git a/THANKS b/THANKS
index 83f47153..8d307650 100644
--- a/THANKS
+++ b/THANKS
@@ -42,5 +42,6 @@ suggesting improvements or submitting changes. Some of these people are:
  * Matthew Hooker <mwhooker@gmail.com>
  * Filipe Manana <fdmanana@gmail.com>
  * Ilia Cheishvili <ilia.cheishvili@gmail.com>
+ * Lena Herrmann <lena@zeromail.org>
 
 For a list of authors see the `AUTHORS` file.
-- 
cgit v1.2.3