Skip to content
Snippets Groups Projects
Commit 9feebf6f authored by Joakim Borge Hunskår's avatar Joakim Borge Hunskår
Browse files

Fix conflicts in featuredemo

# Conflicts:
#   dependencies/testproject_featuredemo.cpp
parents 1c6bc0ec 5c5d92de
No related branches found
No related tags found
1 merge request!11New widget slider
Showing
with 1907 additions and 24 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment