From 498aa386f7b9653be0816a6d0271405bfabd1049 Mon Sep 17 00:00:00 2001
From: dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 24 Mar 2004 02:14:19 +0000
Subject: Allow templates to be specified outside the RDoc tree

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6009 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bbba6104d..594a677d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -96,7 +96,6 @@ Sat Mar 20 21:21:03 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* ext/extmk.rb: rm -rf $extout, not extout.
 
->>>>>>> 1.3082
 Sat Mar 20 15:25:36 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Force
-- 
cgit