diff --git a/README.md b/README.md index d177eb2bc754226c0972fdb54a2354acf1e67593..87bb01095d27f0ffe0a7f9c8e10d75572cdc29f6 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # RandomIterator -<<<<<<< HEAD -Iterator library for lazy calculation and parallel access of counter-based random numbers. -======= + Table of Contents ================= @@ -104,4 +102,3 @@ The authors acknowledge support by the High Performance and Cloud Computing Grou at the Zentrum für Datenverarbeitung of the University of Tübingen, the state of Baden- Württemberg through bwHPC and the German Research Foundation (DFG) through grant no. INST 37/935-1 FUGG. ->>>>>>> 9d1ef2916d7343e70f55033883e86d61ffe0bda9 diff --git a/reference/requirements.txt b/reference/requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..17395f944afca82e983dd9c999ab8804aa1236e7 --- /dev/null +++ b/reference/requirements.txt @@ -0,0 +1 @@ +sphinxcontrib-bibtex>=0.3.6 \ No newline at end of file