Recovering from erroneous merge

This commit is contained in:
ptsurbeleu 2012-08-01 09:20:11 -07:00
parent c1350cf404
commit 0d8f6c61e8
5 changed files with 47 additions and 15 deletions

View file

@ -36,6 +36,6 @@ using System.Reflection;
//
[assembly: AssemblyCompany("Outercurve Foundation")]
[assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation.")]
[assembly: AssemblyVersion("1.2.1.0")]
[assembly: AssemblyFileVersion("1.2.1.1")]
[assembly: AssemblyInformationalVersion("1.2.1")]
[assembly: AssemblyVersion("1.2.2.0")]
[assembly: AssemblyFileVersion("1.2.2.1")]
[assembly: AssemblyInformationalVersion("1.2.2")]