diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-02 18:12:56 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-02 18:12:56 -0500 |
| commit | c0c663a1749c43bd64590263220f843bf79c646e (patch) | |
| tree | 454453ed5335b2b5eec2a3317a0fab61579fb97e /SharedVersion.cs | |
| parent | 6f020735404a528f325631b63dcf0813ceb94a52 (diff) | |
fix merge conflict
Diffstat (limited to 'SharedVersion.cs')
| -rw-r--r-- | SharedVersion.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index 3b6cfe1db..e0732b997 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5800.3")] +[assembly: AssemblyVersion("3.0.5784.0")] |