[opencv] 02/02: fix merge where I was too greedy at removing stuff

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository opencv.

commit 9b865d695be820c1e6691ccf29e8a773169523ff
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Tue Oct 17 22:42:55 2017 +0200

    fix merge where I was too greedy at removing stuff
    
    Gbp-Dch: Ignore
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/patches/mathjax | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/patches/mathjax b/debian/patches/mathjax
index 2d2195a..31f4a45 100644
--- a/debian/patches/mathjax
+++ b/debian/patches/mathjax
@@ -1,6 +1,8 @@
 Description: use system-installed mathjx instead of downloading from the net
 Forwarded: https://github.com/opencv/opencv/pull/9866
 
+--- a/doc/Doxyfile.in
++++ b/doc/Doxyfile.in
 @@ -174,7 +174,7 @@
  FORMULA_TRANSPARENT    = YES
  USE_MATHJAX            = YES

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git