fix bad rebase

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}{%