Skip to content
Snippets Groups Projects
Commit 89a14480 authored by Krzysztof Dymkowski's avatar Krzysztof Dymkowski
Browse files

Remove git diff '>>>>>' comment.

parent bc3095c6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
docs/source/release/v3.9.0/indirect_inelastic.rst
+ 0
− 1
View file @ 89a14480
...@@ -17,7 +17,6 @@ Algorithms ...@@ -17,7 +17,6 @@ Algorithms
- A new algorithm :ref:`Abins <algm-Abins>` which allows comparison of theoretical and experimental INS. - A new algorithm :ref:`Abins <algm-Abins>` which allows comparison of theoretical and experimental INS.
- A 'QuickRun' algorithm :ref:`SofQWMomentsScan <algm-SofQWMomentsScan>` that reduces data and runs through :ref:`SofQW <algm-SofQW>` and :ref:`SofQWMoments <algm-SofQWMoments>`. - A 'QuickRun' algorithm :ref:`SofQWMomentsScan <algm-SofQWMomentsScan>` that reduces data and runs through :ref:`SofQW <algm-SofQW>` and :ref:`SofQWMoments <algm-SofQWMoments>`.
>>>>>>> upstream/master
Data Reduction Data Reduction
############## ##############
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment