Skip to content

Commit a3fec13

Browse files
committed
style: remove stashed change indicators and modify code of conducts to pass pre-commit
1 parent d017240 commit a3fec13

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.github/ISSUE_TEMPLATE/release_checklist.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,8 @@ assignees: ""
1212
- [ ] All the badges on the README are passing.
1313
- [ ] License information is verified as correct. If you are unsure, please comment below.
1414
- [ ] Locally rendered documentation contains all appropriate pages, including API references (check no modules are
15-
<<<<<<< Updated upstream
16-
missing), tutorials, and other human written text is up-to-date with any changes in the code.
17-
- [ ] # Installation instructions in the README, documentation and on the website (e.g., diffpy.org) are updated.
18-
missing), tutorials, and other human-written text is up-to-date with any changes in the code.
15+
missing), tutorials, and other human-written text is up-to-date with any changes in the code.
1916
- [ ] Installation instructions in the README, documentation, and the website are updated.
20-
> > > > > > > Stashed changes
2117
- [ ] Successfully run any tutorial examples or do functional testing with the latest Python version.
2218
- [ ] Grammar and writing quality are checked (no typos).
2319
- [ ] Install `pip install build twine`, run `python -m build` and `twine check dist/*` to ensure that the package can be built and is correctly formatted for PyPI release.

CODE_OF_CONDUCT.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Our Pledge
88
We as members, contributors, and leaders pledge to make participation in our
99
community a harassment-free experience for everyone, regardless of age, body
1010
size, visible or invisible disability, ethnicity, sex characteristics, gender
11-
identity and expression, level of experience, education, socio-economic status,
11+
identity and expression, level of experience, education, socioeconomic status,
1212
nationality, personal appearance, race, caste, color, religion, or sexual
1313
identity and orientation.
1414

0 commit comments

Comments
 (0)