update

gitrymt · gitrymt · commit ae73dedd5d27 · 2018-01-18T17:31:20.000+09:00
diff --git a/Calculation/example/band_calc_1d.py b/Calculation/example/band_calc_1d.py
@@ -14,11 +14,7 @@
 from func_band_calc import calcBand_1d
 
 # Lattice depth V_lat = s Er
-<<<<<<< HEAD
-s = 0
-=======
 s = 20
->>>>>>> 6ba61964d068d9a30528aabf625b11aff62f677a
 
 # Calculation
 q, Energy = calcBand_1d(s, angle=np.pi * 120 / 180)
