From 558e49698dcb0a4105acfbd2a12b8125d032083b Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Mon, 16 Oct 2006 00:05:10 +0000
Subject: Copyright changes

---
 lib/libalpm/conflict.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index 2c63143e..9b6e3124 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -5,6 +5,7 @@
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2006 by David Kimpe <dnaku@frugalware.org>
  *  Copyright (c) 2006 by Miklos Vajna <vmiklos@frugalware.org>
+ *  Copyright (c) 2006 by Christian Hamar <krics@linuxforum.hu>
  * 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
-- 
cgit v1.2.3-70-g09d2