[Bf-blender-cvs] [96e08730f61] temp-alembic-exporter-T73363-ms2: Fixed merge error

[Sybren A. Stüvel]

Commit: 96e08730f61370e0777ca5cea90c7b696f85403e
Author: Sybren A. Stüvel
Date:   Fri Apr 10 17:04:34 2020 +0200
Branches: temp-alembic-exporter-T73363-ms2
https://developer.blender.org/rB96e08730f61370e0777ca5cea90c7b696f85403e

Fixed merge error

===================================================================

M	tests/gtests/usd/abstract_hierarchy_iterator_test.cc

===================================================================

diff --git a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
index 99ab333132b..aba127888b6 100644
--- a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
+++ b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
@@ -40,7 +40,7 @@ class TestHierarchyWriter : public AbstractHierarchyWriter {
   std::string writer_type;
   writing_writers &writers_map;
 
-  TestHierarchyWriter(const std::string &writer_type, created_writers &writers_map)
+  TestHierarchyWriter(const std::string &writer_type, writing_writers &writers_map)
       : writer_type(writer_type), writers_map(writers_map)
   {
   }