remove committed version control marker

This commit is contained in:
Stephen Birarda 2016-03-07 13:57:41 -08:00
parent 7bb97ec3da
commit e6ce517041

View file

@ -621,4 +621,3 @@ void AssetScriptingInterface::getMapping(QString path, QScriptValue callback) {
void AssetScriptingInterface::getAllMappings(QString path, QScriptValue callback) {
}
>>>>>>> 6dd3b1b... Add AssetScriptingInterface methods for mapping