Development (!7) · Merge requests · Di Yao / test_submodule_1 · GitLab

NOTE:

"Standard tab" (eg, extra-Institute) git.isis.v.e accounts currently require approval after registration. Please contact ISIS IT if needed.

Those with ISIS credentials should authenticate with via the "ISIS" tab.

Created by: dyao-vu

Merge from branch development into master.

src/common.py

0 → 100644

+12 −0

Changes for src/common.py: 12 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		def add(x, y):
		return x+y

		def multiply(x, y):
		return x*y

		def main():
		print ("common")


		if __name__ == "__main__":
		main()
		No newline at end of file

src/main.py

0 → 100644

+8 −0

Changes for src/main.py: 8 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		import submodule_one

		def main():
		print ("main")


		if __name__ == "__main__":
		main()
		No newline at end of file