From 72871e8e49ebc271018f5d2ff07a7243aa1e9c65 Mon Sep 17 00:00:00 2001
From: Max New <maxsnew@gmail.com>
Date: Wed, 21 Nov 2018 12:06:43 -0700
Subject: [PATCH] fix bad rebase
---
paper/acmart.cls | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/paper/acmart.cls b/paper/acmart.cls
index ba7eddb..57d17eb 100644
--- a/paper/acmart.cls
+++ b/paper/acmart.cls
@@ -38,19 +38,8 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{acmart}
-<<<<<<< HEAD
-[2018/05/09 v1.54 Typesetting articles for the Association for
-Computing Machinery, modified to add a 'nonacm' option -- see
- https://github.com/borisveytsman/acmart/pull/282.
-You may obtain the source of this modified version at
- https://github.com/gasche/acmart/blob/nonacm-derived/acmart.dtx,
-and the original version at
- https://github.com/borisveytsman/acmart/.
-]
-=======
[2018/10/20 v1.55 Typesetting articles for the Association for
Computing Machinery]
->>>>>>> update acmart, use correct titlecase
\def\@classname{acmart}
\InputIfFileExists{acmart-preload-hook.tex}{%
\ClassWarning{\@classname}{%
--
GitLab