ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into kim-simulator-models

Browse Source 
# Resolved Conflicts:
#	src/KIM/kim_query.cpp
#	src/KIM/pair_kim.cpp
This commit is contained in:
Axel Kohlmeyer
2019-07-29 20:43:10 -04:00
parent c03e9c9711 2e6850835f
commit 6833d6def6
1474 changed files with 3992 additions and 5934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/input.h
View File

@ -14,7 +14,6 @@
#ifndef LMP_INPUT_H
#define LMP_INPUT_H
#include <cstdio>
#include "pointers.h"
#include <map>
#include <string>