From e6ce5170418682d9d96e006178996cc2ec84176f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 7 Mar 2016 13:57:41 -0800 Subject: [PATCH] remove committed version control marker --- libraries/networking/src/AssetClient.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp index 51c5ae8cb3..deb1d9eb7d 100644 --- a/libraries/networking/src/AssetClient.cpp +++ b/libraries/networking/src/AssetClient.cpp @@ -621,4 +621,3 @@ void AssetScriptingInterface::getMapping(QString path, QScriptValue callback) { void AssetScriptingInterface::getAllMappings(QString path, QScriptValue callback) { } ->>>>>>> 6dd3b1b... Add AssetScriptingInterface methods for mapping