Fix ambiguous language and merge conflict.

Signed-off-by: Rodrigo Caballero <rodrigo.caballero.abraham@intel.com>
This commit is contained in:
Rodrigo Caballero
2017-10-31 11:46:07 -06:00
parent 4962a15dbf
commit 32644a4e4e
2 changed files with 3 additions and 2 deletions
+2 -2
View File
@@ -210,8 +210,8 @@ To follow the same approach with a package like FFT, we must use the
patching fftw-3.3.6-pl2/libbench2/caset.c @ lines (5)
patching fftw-3.3.6-pl2/libbench2/verify-r2r.c @ lines (44 187 197 207 316 333 723)
Thus, files like :file:`fftw-3.3.6-pl2/tools/fftw-wisdom.c.patch` generate
patches like this:
For example, the :file:`fftw-3.3.6-pl2/tools/fftw-wisdom.c.patch` file
generates the following patches:
.. code-block:: git
@@ -14,4 +14,5 @@ specific |CLOSIA| use cases.
machine-learning/machine-learning
azure
multi-boot/multi-boot
hadoop
fmv