diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-16 01:54:27 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-16 01:54:27 -0400 |
| commit | f66a25db1cd80025c0a334495e112ff4e0e35eb8 (patch) | |
| tree | 55f4f10d209c0b91b435a16e5ec8bec8e6780976 /SharedVersion.cs | |
| parent | 42cbe6299007aa7e1344b032fcbba907e830504e (diff) | |
fix merge conflict
Diffstat (limited to 'SharedVersion.cs')
| -rw-r--r-- | SharedVersion.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index b85021de4..ded2038b0 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.106")] +[assembly: AssemblyVersion("3.1.*")] +//[assembly: AssemblyVersion("3.0.6060")] |