Fix bad merge in storage-classes-cpp

fredemmott · web-flow · commit f9a7aa974380 · 2017-09-01T11:46:26.000-07:00
Had merge conflict markers
diff --git a/docs/cpp/storage-classes-cpp.md b/docs/cpp/storage-classes-cpp.md
@@ -44,7 +44,6 @@ A *storage class* in the context of C++ variable declarations is a type specifie
   
 1.  The [mutable](../cpp/mutable-data-members-cpp.md) keyword may be considered a storage class specifier. However, it is only available in the member list of a class definition.  
   
-<<<<<<< HEAD
 2.  **Visual C++ 2010 and later:** The `auto` keyword is no longer a C++ storage-class specifier, and the `register` keyword is deprecated. **Visual Studio 2017 version 15.3 and later:** (available with [/std:c++17](../build/reference/std-specify-language-standard-version.md)): The `register` keyword is no longer a supported storage class. The keyword is still reserved in the standard for future use. 
 ```cpp
    register int val; // warning C5033: 'register' is no longer a supported storage class
@@ -53,10 +52,9 @@ A *storage class* in the context of C++ variable declarations is a type specifie
 ## In this section:
   
 -   [static](#static)  
-=======
-2.  Starting in Visual C++ 2010, the `auto` keyword is no longer a C++ storage-class specifier, and the `register` keyword is deprecated.  
->>>>>>> master
-  
+-   [extern](#extern)  
+-   [thread_local](#thread_local)
+
 <a name="static"></a>
   
 ## static  
@@ -338,4 +336,4 @@ There are several points to note about the program:
   
 ## See Also  
   
- [Declarations and Definitions](../cpp/declarations-and-definitions-cpp.md)
+ [Declarations and Definitions](../cpp/declarations-and-definitions-cpp.md)
