Resolved merge conflicts when rebasing miscellaneous branch (cec7cafd) · Commits · Software Public / PASSOFT / rt2ms_py3 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

rt2ms_py3
- Activity
- Members
- Labels
- Issues
  9
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

cec7cafd

Commit cec7cafd authored 1 year ago by Maeva Pourpoint

Downloads
- Patches
- Plain Diff

Resolved merge conflicts when rebasing miscellaneous branch

parent a5b08d71

1 merge request!25Address data group feedback

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

HISTORY.rst 5 additions, 0 deletions

HISTORY.rst
conda.recipe/meta.yaml 4 additions, 0 deletions

conda.recipe/meta.yaml
obspy_replace/__init__.py 4 additions, 0 deletions

obspy_replace/__init__.py
rt2ms_py3/__init__.py 1 addition, 1 deletion

rt2ms_py3/__init__.py
rt2ms_py3/rt2ms_py3.py 1 addition, 1 deletion

rt2ms_py3/rt2ms_py3.py
setup.py 4 additions, 0 deletions

setup.py

with 19 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment