Skip to content

Commit

Permalink
fix another git manual merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
karlnapf authored and vigsterkr committed Mar 10, 2016
1 parent 28e761d commit f08428d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion doc/cookbook/source/conf.py
Expand Up @@ -191,7 +191,7 @@
('java', 'java'),
('ruby', 'rb'),
('r', 'R'),
('lua', 'lua')
('lua', 'lua'),
('csharp', 'cs'),
('cpp', 'cpp'),
)
Expand Down

0 comments on commit f08428d

Please sign in to comment.