mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto stash before merge of "master" and "origin/master"

Browse source
This commit is contained in:
Ash 2020-02-06 16:01:04 -05:00
commit 6210384d66
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ryujinx/Ui/AboutWindow.cs
View file

@ -49,6 +49,14 @@ namespace Ryujinx.Ui
string currentVersionJson; string currentVersionJson;
string currentVersionBranch; string currentVersionBranch;
string currentVersionPr; string currentVersionPr;
<<<<<<< Updated upstream
=======
var VersionJSON = JObject.Parse(File.ReadAllText(System.IO.Path.Combine(Environment.CurrentDirectory, "Version.json")));
var _JRoot = VersionJSON[""];
currentVersionJson = (string)_JRoot["BuildVer"];
currentVersionPr = (string)_JRoot["BuildPR"];
currentVersionBranch = (string)_JRoot["BuildBranch"];
>>>>>>> Stashed changes
JObject VersionJSON = JObject.Parse(File.ReadAllText(System.IO.Path.Combine(Environment.CurrentDirectory, "Version.json"))); JObject VersionJSON = JObject.Parse(File.ReadAllText(System.IO.Path.Combine(Environment.CurrentDirectory, "Version.json")));