Skip to content

Commit ec90f12

Browse files
authored
Remove an accidentally-committed merge conflict marker :-)
1 parent 4c9cb90 commit ec90f12

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

serilog-sinks-xamarin.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio Version 17
33
VisualStudioVersion = 17.3.32708.82
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
<<<<<<< HEAD
65
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{322FD05A-A274-4AF2-99CA-BCCB0B4400F5}"
76
ProjectSection(SolutionItems) = preProject
87
appveyor.yml = appveyor.yml

0 commit comments

Comments
 (0)