diff options
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/epydoc-config | 5 |
1 files changed, 1 insertions, 4 deletions
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 |