From 6912ca8510052b8a405ee6ee500d524a5e42f35e Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Fri, 27 Feb 2009 23:43:42 +0000
Subject: delete duplicate block; spotted by kettenis

---
 lib/fontconfig/conf.d/31-nonmst.conf | 59 +-----------------------------------
 1 file changed, 1 insertion(+), 58 deletions(-)

(limited to 'lib/fontconfig')

diff --git a/lib/fontconfig/conf.d/31-nonmst.conf b/lib/fontconfig/conf.d/31-nonmst.conf
index 7ba69b349..1c145fce6 100644
--- a/lib/fontconfig/conf.d/31-nonmst.conf
+++ b/lib/fontconfig/conf.d/31-nonmst.conf
@@ -3,7 +3,7 @@
 <fontconfig>
 
 	<!--
-		$OpenBSD: 31-nonmst.conf,v 1.1 2009/02/27 23:12:11 matthieu Exp $
+		$OpenBSD: 31-nonmst.conf,v 1.2 2009/02/27 23:43:41 deraadt Exp $
 		Replacement using Bitstream Vera fonts.
 	-->
 
@@ -53,60 +53,3 @@
 	</match>
 
 </fontconfig>
-
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-	<!--
-		$OpenBSD: 31-nonmst.conf,v 1.1 2009/02/27 23:12:11 matthieu Exp $
-		Replacement using Liberation fonts.
-	-->
-
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>Times New Roman</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>Bitstream Vera Serif</string>
-		</edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>Times</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>Bitstream Vera Serif</string>
-		</edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>Arial</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>Bitstream Vera Sans</string>
-		</edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>Helvetica</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>Bitstream Vera Sans</string>
-		</edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>Courier</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>Bitstream Vera Sans Mono</string>
-		</edit>
-	</match>
-
-</fontconfig>
-
-- 
cgit v1.2.3