reb

fluentassertions · Dec 20, 2022 · 6f84f10 · 6f84f10
1 parent 1b6d49b
commit 6f84f10
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 36 deletions.
diff --git a/Tests/Approval.Tests/ApprovedApi/FluentAssertions/net47.verified.txt b/Tests/Approval.Tests/ApprovedApi/FluentAssertions/net47.verified.txt
@@ -2657,21 +2657,15 @@ namespace FluentAssertions.Types
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreInNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreInterfaces() { }
-<<<<<<< HEAD
         public FluentAssertions.Types.TypeSelector ThatAreNotAbstract() { }
-=======
->>>>>>> ba64cbad (Updated ThatAre[Not]Interface Methods to ThatAre[Not]Interfaces)
         public FluentAssertions.Types.TypeSelector ThatAreNotClasses() { }
         public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWith<TAttribute>()
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWithOrInherit<TAttribute>()
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreNotInNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreNotInterfaces() { }
-<<<<<<< HEAD
         public FluentAssertions.Types.TypeSelector ThatAreNotSealed() { }
-=======
->>>>>>> ba64cbad (Updated ThatAre[Not]Interface Methods to ThatAre[Not]Interfaces)
         public FluentAssertions.Types.TypeSelector ThatAreNotStatic() { }
         public FluentAssertions.Types.TypeSelector ThatAreNotUnderNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreSealed() { }

diff --git a/Tests/Approval.Tests/ApprovedApi/FluentAssertions/net6.0.verified.txt b/Tests/Approval.Tests/ApprovedApi/FluentAssertions/net6.0.verified.txt
@@ -2787,21 +2787,15 @@ namespace FluentAssertions.Types
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreInNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreInterfaces() { }
-<<<<<<< HEAD
         public FluentAssertions.Types.TypeSelector ThatAreNotAbstract() { }
-=======
->>>>>>> ba64cbad (Updated ThatAre[Not]Interface Methods to ThatAre[Not]Interfaces)
         public FluentAssertions.Types.TypeSelector ThatAreNotClasses() { }
         public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWith<TAttribute>()
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWithOrInherit<TAttribute>()
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreNotInNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreNotInterfaces() { }
-<<<<<<< HEAD
         public FluentAssertions.Types.TypeSelector ThatAreNotSealed() { }
-=======
->>>>>>> ba64cbad (Updated ThatAre[Not]Interface Methods to ThatAre[Not]Interfaces)
         public FluentAssertions.Types.TypeSelector ThatAreNotStatic() { }
         public FluentAssertions.Types.TypeSelector ThatAreNotUnderNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreSealed() { }

diff --git a/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netcoreapp2.1.verified.txt b/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netcoreapp2.1.verified.txt
@@ -2659,21 +2659,15 @@ namespace FluentAssertions.Types
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreInNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreInterfaces() { }
-<<<<<<< HEAD
         public FluentAssertions.Types.TypeSelector ThatAreNotAbstract() { }
-=======
->>>>>>> ba64cbad (Updated ThatAre[Not]Interface Methods to ThatAre[Not]Interfaces)
         public FluentAssertions.Types.TypeSelector ThatAreNotClasses() { }
         public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWith<TAttribute>()
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWithOrInherit<TAttribute>()
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreNotInNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreNotInterfaces() { }
-<<<<<<< HEAD
         public FluentAssertions.Types.TypeSelector ThatAreNotSealed() { }
-=======
->>>>>>> ba64cbad (Updated ThatAre[Not]Interface Methods to ThatAre[Not]Interfaces)
         public FluentAssertions.Types.TypeSelector ThatAreNotStatic() { }
         public FluentAssertions.Types.TypeSelector ThatAreNotUnderNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreSealed() { }

diff --git a/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netcoreapp3.0.verified.txt b/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netcoreapp3.0.verified.txt
@@ -2659,21 +2659,15 @@ namespace FluentAssertions.Types
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreInNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreInterfaces() { }
-<<<<<<< HEAD
         public FluentAssertions.Types.TypeSelector ThatAreNotAbstract() { }
-=======
->>>>>>> ba64cbad (Updated ThatAre[Not]Interface Methods to ThatAre[Not]Interfaces)
         public FluentAssertions.Types.TypeSelector ThatAreNotClasses() { }
         public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWith<TAttribute>()
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWithOrInherit<TAttribute>()
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreNotInNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreNotInterfaces() { }
-<<<<<<< HEAD
         public FluentAssertions.Types.TypeSelector ThatAreNotSealed() { }
-=======
->>>>>>> ba64cbad (Updated ThatAre[Not]Interface Methods to ThatAre[Not]Interfaces)
         public FluentAssertions.Types.TypeSelector ThatAreNotStatic() { }
         public FluentAssertions.Types.TypeSelector ThatAreNotUnderNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreSealed() { }

diff --git a/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netstandard2.0.verified.txt b/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netstandard2.0.verified.txt
@@ -2608,21 +2608,15 @@ namespace FluentAssertions.Types
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreInNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreInterfaces() { }
-<<<<<<< HEAD
         public FluentAssertions.Types.TypeSelector ThatAreNotAbstract() { }
-=======
->>>>>>> ba64cbad (Updated ThatAre[Not]Interface Methods to ThatAre[Not]Interfaces)
         public FluentAssertions.Types.TypeSelector ThatAreNotClasses() { }
         public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWith<TAttribute>()
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWithOrInherit<TAttribute>()
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreNotInNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreNotInterfaces() { }
-<<<<<<< HEAD
         public FluentAssertions.Types.TypeSelector ThatAreNotSealed() { }
-=======
->>>>>>> ba64cbad (Updated ThatAre[Not]Interface Methods to ThatAre[Not]Interfaces)
         public FluentAssertions.Types.TypeSelector ThatAreNotStatic() { }
         public FluentAssertions.Types.TypeSelector ThatAreNotUnderNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreSealed() { }

diff --git a/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netstandard2.1.verified.txt b/Tests/Approval.Tests/ApprovedApi/FluentAssertions/netstandard2.1.verified.txt
@@ -2659,21 +2659,15 @@ namespace FluentAssertions.Types
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreInNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreInterfaces() { }
-<<<<<<< HEAD
         public FluentAssertions.Types.TypeSelector ThatAreNotAbstract() { }
-=======
->>>>>>> ba64cbad (Updated ThatAre[Not]Interface Methods to ThatAre[Not]Interfaces)
         public FluentAssertions.Types.TypeSelector ThatAreNotClasses() { }
         public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWith<TAttribute>()
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWithOrInherit<TAttribute>()
             where TAttribute : System.Attribute { }
         public FluentAssertions.Types.TypeSelector ThatAreNotInNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreNotInterfaces() { }
-<<<<<<< HEAD
         public FluentAssertions.Types.TypeSelector ThatAreNotSealed() { }
-=======
->>>>>>> ba64cbad (Updated ThatAre[Not]Interface Methods to ThatAre[Not]Interfaces)
         public FluentAssertions.Types.TypeSelector ThatAreNotStatic() { }
         public FluentAssertions.Types.TypeSelector ThatAreNotUnderNamespace(string @namespace) { }
         public FluentAssertions.Types.TypeSelector ThatAreSealed() { }