Fixing merge conflict

This commit is contained in:
apoorv569 2021-05-20 05:12:24 +05:30
commit 5f8e7a2693
2 changed files with 3 additions and 1 deletions

View File

@ -12,6 +12,8 @@ packages:
- libtag1-dev - libtag1-dev
- libtagc0 - libtagc0
- libexif-dev - libexif-dev
- libpango1.0-dev
- pkg-config
- git - git
- meson - meson
- g++ - g++

View File

@ -29,7 +29,7 @@ endforeach
wx = dependency('wxwidgets', version: '>=3.0.4') wx = dependency('wxwidgets', version: '>=3.0.4')
wxsvg = dependency('libwxsvg') wxsvg = dependency('libwxsvg')
taglib = dependency('taglib', version: '>=1.12') taglib = dependency('taglib', version: '>=1.11')
sqlite3 = dependency('sqlite3') sqlite3 = dependency('sqlite3')
yaml = dependency('yaml-cpp') yaml = dependency('yaml-cpp')