Merging assembly versioning fixes (#212)

* changed 2015 to 2017 for VS build instructions * better version of VS build section * .gitignore: added *.orig * update readme for 2.7.2 tagging
dotnet · Jun 6, 2017 · b932297 · b932297
1 parent 840865b
commit b932297
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -179,3 +179,6 @@ project.lock.json
 .vs/
 Tests/
 TestFiles/
+
+# git merge files
+*.orig
diff --git a/README.md b/README.md
@@ -88,6 +88,9 @@ We are also happy to announce the release of Open-Xml-PowerTools on GitHub.  Ope
 Change Log
 ==========
 
+Version 2.7.2 : June 6, 2017
+- Fixed assembly versioning.
+
 Version 2.7.1 : January 31, 2017
 - Fixed crash when validation is invoked on .NET Framework with strong-naming enforced
-Original file line number
+Diff line change
@@ Expand Up / @@ -179,3 +179,6 @@ project.lock.json @@
     .vs/
     Tests/
     TestFiles/
+    # git merge files
+    *.orig