Skip to content

Commit 840374a

Browse files
committed
Fix borked merge conflict resolution
1 parent c01e926 commit 840374a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/tests/regression/reported/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ caf_compile_executable(issue-493-coindex-slice issue-493-coindex-slice.f90)
1010
caf_compile_executable(issue-503-multidim-array-broadcast issue-503-multidim-array-broadcast.f90)
1111
caf_compile_executable(issue-503-non-contig-red-ndarray issue-503-non-contig-red-ndarray.f90)
1212
if (gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0))
13-
caf_compile_executable(issue-515-mimic-mpi-gatherv issue-515-mimic-mpi-gatherv.f90)
13+
caf_compile_executable(issue-515-mimic-mpi-gatherv issue-515-mimic-mpi-gatherv.f90)
14+
endif()

0 commit comments

Comments
 (0)