File tree Expand file tree Collapse file tree 1 file changed +10
-14
lines changed Expand file tree Collapse file tree 1 file changed +10
-14
lines changed Original file line number Diff line number Diff line change @@ -17,12 +17,18 @@ This GitHub project is the starting point for Swagger.
1717Here you will find the information you need about the Swagger Specification, a simple static sample of what it looks like,
1818and some general information regarding the project.
1919
20- <<<<<<< HEAD
21- ## Current Version - 1.2
2220
23- The current version of the Swagger specification is 1.2 - and you can find it [ here ] ( versions/1.2.md ) .
21+ ## Current Version - 2.0
2422
25- ### [ Swagger 1.2 Specification] ( versions/1.2.md )
23+ The current version of the Swagger specification is 2.0 - and you can find it [ here] ( versions/2.0.md ) .
24+
25+ ### [ Swagger 2.0 Specification] ( versions/2.0.md )
26+
27+ This repository contains the existing Swagger 1.2 specification as well as proposals for the 2.0 version.
28+
29+ ## Structure
30+
31+ Each section should contain v1.2 and v2.0 folders to avoid confusion between the versions.
2632
2733Please keep in mind that the other projects under Swagger use an independent version system.
2834As such, don't confuse the version of the Swagger Specification they support and the version of that given library.
@@ -122,16 +128,6 @@ These are third party tools generated by the Swagger community:
122128
123129- [ gform-admin] ( https://github.com/stemey/gform-admin ) - An alternative UI client for Swagger.
124130
125- ## Support
126- =======
127- ## Planning Version - 2.0
128-
129- This repository contains the existing Swagger 1.2 specification as well as proposals for the 2.0 version.
130-
131- ## Structure
132-
133- Each section should contain v1.2 and v2.0 folders to avoid confusion between the versions.
134-
135131## License
136132
137133Copyright 2014 Reverb Technologies, Inc.
You can’t perform that action at this time.
0 commit comments