Changeset ae63a18 for doc/refrat/refrat.tex

Timestamp:

Dec 18, 2015, 2:56:11 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

8762501

Parents:

baf7fee (diff), c23f807 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolving conflicts

File:

• doc/refrat/refrat.tex (modified) (1 diff)

doc/refrat/refrat.tex

@@ -112 +112 @@
 \lstset{
 language=CFA,
-columns=fullflexible,
+columns=flexible,
 basicstyle=\sf\small,
 tabsize=4,
 xleftmargin=\parindent,
 escapechar=@,
-%fancyvrb=true,
+keepspaces=true,
 %showtabs=true,
-keepspaces=true,
-showtabs=true,
-tab=,
+%tab=\rightarrowfill,
 }%