diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-12-28 16:13:01 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-12-28 16:13:01 -0500 |
| commit | e47ccdce4247b93faa6d27849b255aac83324c42 (patch) | |
| tree | 6b06fb00ccabd33dedf67e4db00761139fe55f3f /SharedVersion.cs | |
| parent | 9ca0c04ee726d4a4972e871865f2c272035d8660 (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 d5d62302e..c082f5664 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.1")] +[assembly: AssemblyVersion("3.1.265")] |