mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-03 22:53:10 +02:00
missed a file
This commit is contained in:
parent
51586625e7
commit
edf16b15e8
1 changed files with 2 additions and 9 deletions
|
@ -13,15 +13,8 @@ import QtQuick 2.7
|
|||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Controls.Styles 1.4 as OriginalStyles
|
||||
|
||||
<<<<<<< HEAD
|
||||
import "qrc:////qml//controls-uit" as HifiControlsUit
|
||||
import "qrc:////qml//styles-uit" as HifiStylesUit
|
||||
|
||||
import TabletScriptingInterface 1.0
|
||||
=======
|
||||
import controlsUit 1.0
|
||||
import stylesUit 1.0
|
||||
>>>>>>> 63bf0777766bc2421184a1cd9a06ed775b09fc1c
|
||||
import controlsUit 1.0 as HiFiControlsUit
|
||||
import stylesUit 1.0 as HifiStylesUit
|
||||
|
||||
Item {
|
||||
id: linkAccountBody
|
||||
|
|
Loading…
Reference in a new issue