From f0f2ed47e265ca01dea3b8a217afc8b45690fc5e Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 31 Aug 2003 14:34:25 +0000
Subject: resolv ed conbflict

git-svn-id: file:///home/lennart/svn/public/syrep/trunk@17 07ea20a6-d2c5-0310-9e02-9ef735347d72
---
 src/dbstruct.h | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'src/dbstruct.h')

diff --git a/src/dbstruct.h b/src/dbstruct.h
index 1b7a9be..2df2aed 100644
--- a/src/dbstruct.h
+++ b/src/dbstruct.h
@@ -26,16 +26,6 @@ struct syrep_meta {
     uint32_t last_seen;
 };
 
-/* struct syrep_namels { */
-/*     uint32_t last_seen; */
-/*     struct syrep_name name; */
-/* }; */
-
-/* struct syrep_mdls { */
-/*     uint32_t last_seen; */
-/*     struct syrep_md md; */
-/* }; */
-
 struct syrep_timestamp {
     uint32_t t;
 };
@@ -55,8 +45,4 @@ struct syrep_version {
  * 
  */
 
-/*
- * syrep_namels :: syrep_md         => namels_md
- * syrep_mdls :: syrep_name         => mdls_name
- */
 #endif
-- 
cgit