Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-14 14:33:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsolve rebase conflict

Browse source
This commit is contained in:
Alexander Ivash 2018-11-03 11:06:21 +05:30
parent 4c6700b497
commit a3dfc873b7
1 changed files with 2 additions and 2 deletions

4
interface/resources/qml/hifi/dialogs/security/Security.qml
View file

@ -14,8 +14,8 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import "qrc:////qml//styles-uit" as HifiStylesUit import stylesUit 1.0 as HifiStylesUit
import "qrc:////qml//controls-uit" as HifiControlsUit import controlsUit 1.0 as as HifiControlsUit
import "qrc:////qml//controls" as HifiControls import "qrc:////qml//controls" as HifiControls
import "qrc:////qml//hifi//commerce//common" as HifiCommerceCommon import "qrc:////qml//hifi//commerce//common" as HifiCommerceCommon