aboutsummaryrefslogtreecommitdiffstats
path: root/paper/paper.tex
diff options
context:
space:
mode:
authorjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-07-05 15:10:08 -0700
committerjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-07-05 15:10:08 -0700
commit7e62f795f9011b7dfff9ac6baec77e3d0f0ba94f (patch)
treebbd0e5cceb5e9ba311d877e72e46a8171c8af566 /paper/paper.tex
parentb9b952e2a9a91c68058622ddaa5b23be7b47d3a7 (diff)
parent27b55f70aeb9025560481a1756eca03b8eabd0a1 (diff)
downloadcascades-7e62f795f9011b7dfff9ac6baec77e3d0f0ba94f.tar.gz
fixing merge conflicts
Diffstat (limited to 'paper/paper.tex')
-rw-r--r--paper/paper.tex2
1 files changed, 1 insertions, 1 deletions
diff --git a/paper/paper.tex b/paper/paper.tex
index ccd1daf..41a7f74 100644
--- a/paper/paper.tex
+++ b/paper/paper.tex
@@ -41,7 +41,7 @@
% note in the first column to ``Proceedings of the...''
%\usepackage[accepted]{icml2015}
\usepackage[utf8]{inputenc}
-%\usepackage{caption}
+\usepackage[T1]{fontenc}
\usepackage{array}
% This is only temporary to take the reviewers' comments into account