New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

catch up PRC writer with ProgramArgs and Dimension enumeration refactor #12

Closed

msmitherdc wants to merge 6 commits into master from program-args

Merge fix

Loading branch information

msmitherdc committed Oct 14, 2016

commit 751f1c6f7846e76555308db3046d89b3f0dda35c

src/PrcWriter.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,6 @@ std::string PrcWriter::getName() const @@
     }
-    <<<<<<< HEAD
     PrcWriter::PrcWriter()
         : Writer()
         , m_outputFormat(OUTPUT_FORMAT_PDF)
@@ Expand Down @@