Skip to content

Commit fdc8ba4

Browse files
ChangLi27ChangLi27
committed
Fix conflict
1 parent af31ba9 commit fdc8ba4

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

‎src/Common/TsneAnalysis.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#include "TsneAnalysis.h"
22

3-
<<<<<<< HEAD
4-
=======
53
//#include "hdi/utils/glad/glad.h" // remove for error in macos build
6-
>>>>>>> master
4+
75
#include "OffscreenBuffer.h"
86

97
#include <cassert>

0 commit comments

Comments
 (0)