Resolve conflicts

darrelmiller · darrelmiller · commit a04b0572ff8e · 2016-09-29T12:51:14.000-04:00
# Conflicts:
#	versions/3.0.md
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -1,6 +1,6 @@
 * Darrel Miller [@darrelmiller](https://github.com/darrelmiller)
-* Jason Harmon [@jasonh-n-austin](https://github.com/jasonh-n-austin)
+* Jason Harmon [@jharmn](https://github.com/jharmn)
 * Jeremy Whitlock [@whitlockjc](https://github.com/whitlockjc)
 * Marsh Gardiner [@earth2marsh](https://github.com/earth2marsh)
 * Ron Ratovsky [@webron](https://github.com/webron)
-* Tony Tam [@fehguy](https://github.com/fehguy)
+* Tony Tam [@fehguy](https://github.com/fehguy)
diff --git a/guidelines/EXTENSIONS.md b/guidelines/EXTENSIONS.md
@@ -89,4 +89,4 @@ An API consumer reading these parameter definitions could interpret this as havi
 
 ## Annotations
 
-The Swagger specific annotations currently available for jax-rs APIs do not support the addition of extension data.
+The Swagger-specific annotations currently available for jax-rs APIs do not support the addition of extension data.
diff --git a/versions/3.0.md b/versions/3.0.md

Original file line number	Diff line number	Diff line change
`@@ -89,4 +89,4 @@ An API consumer reading these parameter definitions could interpret this as havi`
`89`	`89`
`90`	`90`	`## Annotations`
`91`	`91`
`92`		`-The Swagger specific annotations currently available for jax-rs APIs do not support the addition of extension data.`
	`92`	`+The Swagger-specific annotations currently available for jax-rs APIs do not support the addition of extension data.`