summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-12-22 20:02:51 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2019-12-22 20:02:51 (GMT)
commitd376b8a80eb26feec66c22358d67ed134395169a (patch)
treeb705a15da554eb99b3dac15c4888ec8fbeddef27 /src
parentd244b46490a6c5e1d9179c46683811ad56557809 (diff)
downloadDoxygen-d376b8a80eb26feec66c22358d67ed134395169a.zip
Doxygen-d376b8a80eb26feec66c22358d67ed134395169a.tar.gz
Doxygen-d376b8a80eb26feec66c22358d67ed134395169a.tar.bz2
Fixed merge issue
Diffstat (limited to 'src')
-rw-r--r--src/commentcnv.l2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/commentcnv.l b/src/commentcnv.l
index 5b521ef..f3367a4 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -729,7 +729,7 @@ MAILADR ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z
BEGIN(Scan);
}
<ReadLine>"/**" {
- copyToOutput("/&zwj;**",8);
+ copyToOutput(yyscanner,"/&zwj;**",8);
}
<ReadLine>"*/" {
copyToOutput(yyscanner,"*&zwj;/",7);