Resolved merge conflict by accepting incomming changes (de78e309) · Commits · 郑智淋 / lammps

bench/POTENTIALS/CH.airebo

deleted100644 → 0

+1 −37592

File deleted.

Preview size limit exceeded, changes collapsed.

0 → 120000

+1 −37592

Original line number	Diff line number	Diff line
		../../potentials/CH.airebo
		No newline at end of file

deleted100644 → 0

+1 −4833

File deleted.

Preview size limit exceeded, changes collapsed.

0 → 120000

+1 −4833

Original line number	Diff line number	Diff line
		../../potentials/CdTe.bop.table
		No newline at end of file

deleted100644 → 0

+1 −305

File deleted.

Preview size limit exceeded, changes collapsed.