Revert "res. confl"

This reverts commit 69985bb1.

Revert "res. confl"
This reverts commit 69985bb1.
c0fbe93b · snuverink_j · 69985bb1 · c0fbe93b · c0fbe93b · c0fbe93b
Commit c0fbe93b authored 7 years ago by snuverink_j
--- a/.gitattributes
+++ b/.gitattributes
--- a/.gitignore
+++ b/.gitignore
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/CMakeModules/FindGSL.cmake
+++ b/CMakeModules/FindGSL.cmake
--- a/CMakeModules/FindGTest.cmake
+++ b/CMakeModules/FindGTest.cmake
--- a/CMakeModules/FindH5Hut.cmake
+++ b/CMakeModules/FindH5Hut.cmake
--- a/CMakeModules/FindHDF5.cmake
+++ b/CMakeModules/FindHDF5.cmake
--- a/CMakeModules/FindSDDS.cmake
+++ b/CMakeModules/FindSDDS.cmake
--- a/Doxyfile
+++ b/Doxyfile
--- a/README.md
+++ b/README.md
--- a/cmake/OPALConfig.cmake.in
+++ b/cmake/OPALConfig.cmake.in
--- a/doc/randomnotes.txt
+++ b/doc/randomnotes.txt
--- a/doc/refcard/opal-ref-card-bibliography.bib
+++ b/doc/refcard/opal-ref-card-bibliography.bib
--- a/doc/refcard/opal-refcard.tex
+++ b/doc/refcard/opal-refcard.tex
--- a/ippl/CMakeLists.txt
+++ b/ippl/CMakeLists.txt
--- a/ippl/Doxyfile
+++ b/ippl/Doxyfile
--- a/ippl/INSTALL
+++ b/ippl/INSTALL
--- a/ippl/LICENSE
+++ b/ippl/LICENSE
--- a/ippl/README
+++ b/ippl/README
--- a/ippl/cmake/IPPLConfig.cmake.in
+++ b/ippl/cmake/IPPLConfig.cmake.in