resolve merge conflict

regrant · regrant · commit 86d7678f80b3 · 2019-05-24T10:34:26.000-06:00
diff --git a/ChangeLog.tex b/ChangeLog.tex
@@ -1,7 +1,9 @@
-The following list contains changes to the community Power API specification version 1.0
+The following list contains changes to the community Power API specification version 0.9
+
 \begin{itemize}
+  \item{First release of community Power API}
   \item{PWR_ObjGetSizeOfName - New function added that allows the user to get the size of buffer required to successfully call PWR_ObjGetName for a given object.}
-  \item{Features to support Power Stack:}
+  \item{Features to support Power Stack}
 \end{itemize}
 
 
diff --git a/PowerAPI_Community.pdf b/PowerAPI_Community.pdf
diff --git a/PowerAPI_Community.tex b/PowerAPI_Community.tex
@@ -589,7 +589,7 @@
 \and Todd Rosedahl\Mark{8}, Andy Warner\Mark{3}, Andrew Younge\Mark{1}} 
 
 %
-\date{June 2019}
+\date{May 2019}
 % ---------------------------------------------------------------------------- %
 %
 % Start the document

Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,7 @@`
`589`	`589`	`\and Todd Rosedahl\Mark{8}, Andy Warner\Mark{3}, Andrew Younge\Mark{1}}`
`590`	`590`
`591`	`591`	`%`
`592`		`-\date{June 2019}`
	`592`	`+\date{May 2019}`
`593`	`593`	`% ---------------------------------------------------------------------------- %`
`594`	`594`	`%`
`595`	`595`	`% Start the document`