diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-25 14:45:56 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-25 14:45:56 -0400 |
| commit | 870c843194a8684d1f1098bbed79ecb27cd3478b (patch) | |
| tree | a149655c274639c3a2c9cddeff2663adc19cfaae /SharedVersion.cs | |
| parent | c904bec20d38e1bfc99025a8da71d9ebd2b4013b (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 045327cec..0f9cd1aec 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6070")] +[assembly: AssemblyVersion("3.1.121")] |