Skip to content

Commit

Permalink
merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas V. Solbrå committed Jun 23, 2017
2 parents 19407a8 + 4810bd1 commit d949574
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion neuronify.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {

QT += qml quick widgets multimedia multimediawidgets charts sql svg xml gui core

CONFIG += c++11 qtquickcompiler
CONFIG += c++14 qtquickcompiler

HEADERS += \
src/io/fileio.h \
Expand Down

0 comments on commit d949574

Please sign in to comment.