diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-04 00:47:50 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-04 00:47:50 -0400 |
| commit | 0c3b7a33c29956aafe54f7e956199c0671f92eff (patch) | |
| tree | 1d2a15f14ca88199433e83eb993ea548dfeb5752 /SharedVersion.cs | |
| parent | 4be3ee433bf3d3d2a500a5b41b11407fb58b2445 (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 d5d322353..d852537b2 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6020")] +[assembly: AssemblyVersion("3.1.89")] |