From 7ffa9fba9ba42f313cd00e7da617d080be8b134c Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 13 Dec 2004 11:50:59 +0000
Subject: Add RCS Id to patch-aa and remove conflicts lines from distinfo.

---
 net/libradius/distinfo         | 7 ++-----
 net/libradius/patches/patch-aa | 2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'net')

diff --git a/net/libradius/distinfo b/net/libradius/distinfo
index 9c6d35c4a72..42b62d90c07 100644
--- a/net/libradius/distinfo
+++ b/net/libradius/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2004/12/13 08:10:52 manu Exp $
+$NetBSD: distinfo,v 1.4 2004/12/13 11:50:59 wiz Exp $
 
 SHA1 (libradius-linux-20040827.tar.gz) = 27abd1390d16befe290ded70579bfdda8fabe68f
 Size (libradius-linux-20040827.tar.gz) = 15791 bytes
-<<<<<<< distinfo
-=======
->>>>>>> 1.2
-SHA1 (patch-aa) = 5fdf496cad5f656f8af502533a1a0e4c376783c6
+SHA1 (patch-aa) = 4d8f06404570a758805afe19cadea9d421808f9f
diff --git a/net/libradius/patches/patch-aa b/net/libradius/patches/patch-aa
index ad86a911015..f115248ad02 100644
--- a/net/libradius/patches/patch-aa
+++ b/net/libradius/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.5 2004/12/13 11:51:00 wiz Exp $
+
 --- Makefile.orig	2004-08-27 09:20:33.000000000 +0200
 +++ Makefile	2004-12-13 09:11:36.000000000 +0100
 @@ -23,17 +23,13 @@
-- 
cgit v1.2.3