resolved conflict

7 jobs for OBJ-loader-negative-indices in 25 minutes and 42 seconds (queued for 1 second)
Status Name Job ID Coverage
  Test
passed clang-c++11 #11662
Linux

00:20:14

passed clang-c++98 #11664
Linux

00:16:55

passed cppcheck #11667
Linux

00:00:28

passed gcc-c++11 #11661
Linux

00:04:06

passed gcc-c++98 #11663
Linux

00:25:41

passed macos-c++11 #11665
Apple

00:16:22

passed macos-c++98 #11666
Apple

00:15:25