Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 09:53:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unintended merge line

Browse source
This commit is contained in:
humbletim 2017-06-19 20:18:39 -04:00
parent 26f651ae7c
commit d3127ba975
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/avatars/src/AvatarData.h
View file

@ -370,7 +370,6 @@ public:
virtual ~AvatarData(); virtual ~AvatarData();
static const QUrl& defaultFullAvatarModelUrl(); static const QUrl& defaultFullAvatarModelUrl();
QUrl cannonicalSkeletonModelURL(const QUrl& empty) const;
virtual bool isMyAvatar() const { return false; } virtual bool isMyAvatar() const { return false; }