Resolve conflicts

# Conflicts: # versions/3.0.md
AndersDJohnson · Sep 29, 2016 · 92633be · 92633be
2 parents 5396c37 + 32897eb
commit 92633be
Show file tree

Hide file tree

Showing 3 changed files with 296 additions and 168 deletions.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -1,5 +1,5 @@
 * 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)

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.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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.