diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-19 14:52:08 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-19 14:52:08 -0500 |
| commit | e951dd20d95c81da29d4f9d8a2cb927e7639518b (patch) | |
| tree | 3e9f6b62efb87525f70fd37113e2f7f213bb8162 | |
| parent | 76bfde2675f832ad389f8d83148cddb66c214f0e (diff) | |
fix merge conflict
| -rw-r--r-- | SharedVersion.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index a23f384f5..1f9e07f26 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5786.0")] +[assembly: AssemblyVersion("3.0.5814")] |