From 8390495a9d7c574213fbff51af6f2aea249d81c7 Mon Sep 17 00:00:00 2001
From: Legrandin <gooksankoo@hoiptorrow.mailexpire.com>
Date: Wed, 19 Oct 2011 23:02:58 +0200
Subject: Further fixed for python 3

---
 Doc/epydoc-config | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'Doc')

diff --git a/Doc/epydoc-config b/Doc/epydoc-config
index 6d59bb0..018e461 100644
--- a/Doc/epydoc-config
+++ b/Doc/epydoc-config
@@ -15,9 +15,6 @@ link: <a href="http://www.pycrypto.org/">PyCrypto.org</a>
 
 # The documentation is usually built on a Linux machine; nt.py tries to
 # import the winrandom module.
-<<<<<<< HEAD
+exclude-introspect: ^Crypto\.Random\.OSRNG\.nt|Crypto\.Util\.winrandom$
 exclude-introspect: ^Crypto\.Util\.osentropy\.nt$
 exclude: ^Crypto\.SelfTest
-=======
-exclude-introspect: ^Crypto\.Random\.OSRNG\.nt|Crypto\.Util\.winrandom$
->>>>>>> b9658a26003ebfcfce1804a2363a29354799b47e
-- 
cgit v1.2.1