Skip to content

Commit 0e5750a

Browse files
author
abacus_fixer
committed
solve conflicts
2 parents 3217f63 + bce2c6f commit 0e5750a

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

‎source/source_esolver/esolver_ks_lcaopw.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#include "esolver_ks_lcaopw.h"
2-
32
#include "source_pw/module_pwdft/elecond.h"
43
#include "source_io/module_parameter/input_conv.h"
5-
64
#include <iostream>
75

86
//--------------temporary----------------------------

0 commit comments

Comments
 (0)