resolve

taichi-dev · Dec 15, 2022 · b949e52 · b949e52
1 parent d77b952
commit b949e52
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/docs/lang/articles/advanced/data_oriented_class.md b/docs/lang/articles/advanced/data_oriented_class.md
@@ -52,16 +52,9 @@ class MyClass:
     def allocate_temp(self, n):
         self.temp = ti.field(dtype = ti.i32, shape=n)
 
-
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
 a = MyClass() # creating an instance of Data-Oriented Class
 
-=======
 a = MyClass() # creating an instance of Data-Oriented Class
->>>>>>> b62e12c10a27a2dd924c4e909976cdfe98a109ce
->>>>>>> f34c256ef7603137916bfd0e61eb454811a068bd
 # a.call_inc() cannot be called, because a.temp has not been allocated at this point
 a.allocate_temp(4) # [0 0 0 0]
 a.call_inc() # [1 1 1 1]