fix bug in unitcell.cpp

wenfei-li · wenfei-li · commit 1cd79550f7ce · 2022-08-12T16:28:39.000+08:00
diff --git a/source/module_cell/unitcell.cpp b/source/module_cell/unitcell.cpp
@@ -336,7 +336,6 @@ void UnitCell::update_pos_tau(const ModuleBase::Vector3<double>* posd_in)
         }
     }
     assert(iat == this->nat);
->>>>>>> 844eeb391cfb566dd7e413fd94a2d14bd8fb9a88
     return;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,6 @@ void UnitCell::update_pos_tau(const ModuleBase::Vector3<double>* posd_in)`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`	`assert(iat == this->nat);`
`339`		`->>>>>>> 844eeb391cfb566dd7e413fd94a2d14bd8fb9a88`
`340`	`339`	`return;`
`341`	`340`	`}`
`342`	`341`