Skip to content

Commit

Permalink
Merge branch 'master' into 24_more_joss_editorial_fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pastewka authored Jan 28, 2024
2 parents 5045e92 + d0d65c4 commit 771985f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion paper/paper.bib
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ @article{Brenner1990
author = {Brenner, Donald W.},
year = {1990},
pages = {9458--9471},
optdoi = {10.1103/PhysRevB.42.9458},
doi = {10.1103/PhysRevB.42.9458},
}

@article{BKS1990,
Expand Down
6 changes: 3 additions & 3 deletions paper/paper.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ affiliations:
index: 3
- name: Institute for Applied Materials, Karlsruhe Institute of Technology, Engelbert-Arnold-Straße 4, 76131 Karlsruhe, Germany
index: 4
- name: Fraunhofer IWM, MikroTribologie Centrum µTC, Wöhlerstraße 11, 79108, Freiburg, Germany
- name: Fraunhofer IWM, MikroTribologie Centrum µTC, Wöhlerstraße 11, 79108 Freiburg, Germany
index: 5
- name: Department of Materials, Imperial College London, London SW7 2AZ, United Kingdom
index: 6
- name: Fritz Haber Institute of the Max Planck Society, Faradayweg 4-6, D-14195 Berlin, Germany
- name: Fritz Haber Institute of the Max Planck Society, Faradayweg 4-6, 14195 Berlin, Germany
index: 7
- name: Cluster of Excellence livMatS, Freiburg Center for Interactive Materials and Bioinspired Technologies, University of Freiburg, Georges-Köhler-Allee 105, 79110, Freiburg, Germany
- name: Cluster of Excellence livMatS, Freiburg Center for Interactive Materials and Bioinspired Technologies, University of Freiburg, Georges-Köhler-Allee 105, 79110 Freiburg, Germany
index: 8
- name : Engineering and Technology Institute Groningen, Faculty of Science and Engineering, University of Groningen, Nijenborgh 4, 9747 AG Groningen, The Netherlands
index: 9
Expand Down

0 comments on commit 771985f

Please sign in to comment.