MERGE_MSG « .git_copy - st-scripts/.git - scripts for spoken tutorials of "Python for Scientific Computing"

summary refs log tree commit diff

path: root/.git_copy/MERGE_MSG

blob: 5c1b878439399c5105d9b74078a1ded8cf1bda59 (plain)

Merge branch 'master' of https://github.com/FOSSEE/st-scripts

Conflicts:
	plotting_data/script.rst