Skip to content

Commit bf88610

Browse files
authored
fpm_filesystem.F90: fix broken resolve conflicts
1 parent 50d3187 commit bf88610

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/fpm_filesystem.F90

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ module fpm_filesystem
1414
public :: basename, canon_path, dirname, is_dir, join_path, number_of_rows, list_files, get_local_prefix, &
1515
mkdir, exists, get_temp_filename, windows_path, unix_path, getline, delete_file, fileopen, fileclose, &
1616
filewrite, warnwrite, parent_dir, is_hidden_file, read_lines, read_lines_expanded, which, run, &
17-
LINE_BUFFER_LEN, os_delete_dir, is_absolute_path, get_home, execute_and_read_output, &
18-
get_dos_path
17+
os_delete_dir, is_absolute_path, get_home, execute_and_read_output, get_dos_path
1918

2019
#ifndef FPM_BOOTSTRAP
2120
interface

0 commit comments

Comments
 (0)