FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

merge · PyJavaZ/PyJavaZ@d9846c1 · GitHub

/ PyJavaZ Public

Commit d9846c1

Browse files
henrypinkard
committed
merge
2 parents 4897f24 + 9be4602 commit d9846c1

2 files changed

Lines changed: 221 additions & 104 deletions

File tree

‎pyjavaz/_version.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1+
<<<<<<< HEAD
12
version_info = (1, 1, 0)
3+
=======
4+
version_info = (1, 0, 1)
5+
>>>>>>> 9be4602723c87e30120e830f8a714e8ac11bc48e
26
__version__ = ".".join(map(str, version_info))

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL