Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@LukePulverenti
LukePulverenti committed Oct 13, 2016
1 parent c4f4e7f commit f8a0c42
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion SharedVersion.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;

//[assembly: AssemblyVersion("3.1.*")]
[assembly: AssemblyVersion("3.0.8000")]
[assembly: AssemblyVersion("3.1.188")]

0 comments on commit f8a0c42

Please sign in to comment.