DOCSIS-Toolkit/buildnum.ver at 3964c0978e5434930b912cbcbe24cedc6bae6f01 - DOCSIS-Toolkit - Gitea: Git with a cup of tea

Kilian/DOCSIS-Toolkit

Kilian Hofmann 3964c0978e Merge branch 'master' of https://git.hofmannnet.myhome-server.de/Kilian/DOCSIS-Toolkit

# Conflicts:
#	Docsis Toolkit.xcodeproj/project.pbxproj
#	Docsis Toolkit.xcodeproj/xcshareddata/xcschemes/All.xcscheme
#	Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme
#	Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Graphic Analysis 2.xcscheme
#	Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme
#	Graphic Analysis 2/Info.plist
#	Graphic Analysis 2/buildnum.ver

2020-11-02 12:19:50 +01:00

7 lines

102 B

Plaintext

Raw Blame History

 version 2.1
 <<<<<<< HEAD
 build 500
 =======
 build 499
 >>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299