fix another git manual merge error

shogun-toolbox · Mar 10, 2016 · 5cc2d0f · 5cc2d0f
1 parent f08428d
commit 5cc2d0f
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/doc/cookbook/source/conf.py b/doc/cookbook/source/conf.py
@@ -204,6 +204,7 @@
                 'csharp': 'C#',
                 'ruby': 'Ruby',
                 'cpp': 'Native C++',
+                'lua': 'Lua',
         }
 
 generated_examples_path = None