Skip to content
Snippets Groups Projects
Commit 8b18b8ff authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Fix merge conflict

parents c727d429 14e0074c
No related branches found
No related tags found
2 merge requests!54Develop,!50M214003/develop
Pipeline #34916 passed
Stage: external
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
src/Makefile.am
+ 1
− 1
View file @ 8b18b8ff
......@@ -14,7 +14,7 @@ endif !FC_MOD_UPPERCASE
if ENABLE_CDI_LIB
pkgconfigdir = $(libdir)/pkgconfig
cmakedir = $(libdir)/cmake
cmakedir = $(libdir)/cmake/cdi
include_HEADERS =
nodist_pkgconfig_DATA =
......
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

Imprint | Privacy Policy