diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-02-06 01:08:09 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-02-06 01:08:09 -0500 |
| commit | 84d2a5303b2eee311628876851335b7b926aa2ea (patch) | |
| tree | 44933b3cb288e8d73939fba64589ee41fd188e91 /SharedVersion.cs | |
| parent | b40250045ab478f3ca29951457084d118ce1a26d (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 e62c8563a..05eb1febb 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.5")] +[assembly: AssemblyVersion("3.1.295")] |