merge bug

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58445 954022d7-b5bf-4e40-9824-e11837661b57

PowerPoint/api.js

@@ -5245,8 +5245,8 @@ window["asc_docs_api"].prototype["asc_nativeApplyChanges"] = function(changes)
 	for (var i = 0; i < _len; i++)
 	{
 	    var Changes = new CCollaborativeChanges();
-        Changes.Set_Id( changes[i]["id"] );
-        Changes.Set_Data( changes[i]["data"] );
+        Changes.Set_Id( changes[i]["Id"] );
+        Changes.Set_Data( changes[i]["Data"] );
 	    CollaborativeEditing.Add_Changes( Changes );
 	}
 	CollaborativeEditing.Apply_OtherChanges();