resolve merge conflicts properly

Author: gewarren

snippets/visualbasic/System.Diagnostics/Stopwatch/Overview/source.vb

@@ -1,24 +1,22 @@
-<<<<<<< HEAD
 ' System.Diagnostics.Stopwatch
 
 '<Snippet1>
 Imports System.Diagnostics
 
 Class OperationsTimer
-   
+
    Public Shared Sub Main()
       DisplayTimerProperties()
-      
+
       Console.WriteLine()
       Console.WriteLine("Press the Enter key to begin:")
       Console.ReadLine()
       Console.WriteLine()
-      
+
       TimeOperations()
    End Sub
-   
-   
-'<Snippet2>
+
+   '<Snippet2>
    Public Shared Sub DisplayTimerProperties()
 
       ' Display the timer frequency and resolution.
@@ -27,30 +25,30 @@ Class OperationsTimer
       Else
          Console.WriteLine("Operations timed using the DateTime class.")
       End If
-      
+
       Dim frequency As Long = Stopwatch.Frequency
       Console.WriteLine("  Timer frequency in ticks per second = {0}", frequency)
       Dim nanosecPerTick As Long = 1000000000 / frequency
       Console.WriteLine("  Timer is accurate within {0} nanoseconds", nanosecPerTick)
 
    End Sub
-   
-'</Snippet2>
-'<Snippet3>
+   '</Snippet2>
+
+   '<Snippet3>
    Private Shared Sub TimeOperations()
 
       Dim nanosecPerTick As Long = 1000000000 / Stopwatch.Frequency
       Const numIterations As Long = 10000
-      
+
       ' Define the operation title names.
       Dim operationNames As String() =  _
         {"Operation: Int32.Parse(""0"")", _
          "Operation: Int32.TryParse(""0"")", _
          "Operation: Int32.Parse(""a"")", _
          "Operation: Int32.TryParse(""a"")"}
-      
-      ' Time four different implementations for parsing 
-      ' an integer from a string. 
+
+      ' Time four different implementations for parsing
+      ' an integer from a string.
 
       Dim operation As Integer
       For operation = 0 To 3
@@ -63,9 +61,9 @@ Class OperationsTimer
          Dim indexFastest As Integer = - 1
          Dim indexSlowest As Integer = - 1
          Dim milliSec As Long = 0
-         
+
          Dim time10kOperations As Stopwatch = Stopwatch.StartNew()
-         
+
          ' Run the current operation 10001 times.
          ' The first execution time will be tossed
          ' out, since it can skew the average time.
@@ -75,20 +73,20 @@ Class OperationsTimer
             Dim ticksThisTime As Long = 0
             Dim inputNum As Integer
             Dim timePerParse As Stopwatch
-            
+
             Select Case operation
                Case 0
                   ' Parse a valid integer using
                   ' a try-catch statement.
                   ' Start a new stopwatch timer.
                   timePerParse = Stopwatch.StartNew()
-                  
+
                   Try
                      inputNum = Int32.Parse("0")
                   Catch e As FormatException
                      inputNum = 0
                   End Try
-                  
+
                   ' Stop the timer, and save the
                   ' elapsed ticks for the operation.
                   timePerParse.Stop()
@@ -98,11 +96,11 @@ Class OperationsTimer
                   ' the TryParse statement.
                   ' Start a new stopwatch timer.
                   timePerParse = Stopwatch.StartNew()
-                  
+
                   If Not Int32.TryParse("0", inputNum) Then
                      inputNum = 0
                   End If
-                  
+
                   ' Stop the timer, and save the
                   ' elapsed ticks for the operation.
                   timePerParse.Stop()
@@ -112,13 +110,13 @@ Class OperationsTimer
                   ' a try-catch statement.
                   ' Start a new stopwatch timer.
                   timePerParse = Stopwatch.StartNew()
-                  
+
                   Try
                      inputNum = Int32.Parse("a")
                   Catch e As FormatException
                      inputNum = 0
                   End Try
-                  
+
                   ' Stop the timer, and save the
                   ' elapsed ticks for the operation.
                   timePerParse.Stop()
@@ -128,28 +126,28 @@ Class OperationsTimer
                   ' the TryParse statement.
                   ' Start a new stopwatch timer.
                   timePerParse = Stopwatch.StartNew()
-                  
+
                   If Not Int32.TryParse("a", inputNum) Then
                      inputNum = 0
                   End If
-                  
+
                   ' Stop the timer, and save the
                   ' elapsed ticks for the operation.
                   timePerParse.Stop()
                   ticksThisTime = timePerParse.ElapsedTicks
-               
+
                Case Else
             End Select
             '</Snippet4>
-            
+
             ' Skip over the time for the first operation,
             ' just in case it caused a one-time
             ' performance hit.
             If i = 0 Then
                time10kOperations.Reset()
                time10kOperations.Start()
             Else
-               
+
                ' Update operation statistics
                ' for iterations 1-10001.
                If maxTicks < ticksThisTime Then
@@ -167,11 +165,11 @@ Class OperationsTimer
                End If
             End If
          Next i
-         
+
          ' Display the statistics for 10000 iterations.
          time10kOperations.Stop()
          milliSec = time10kOperations.ElapsedMilliseconds
-         
+
          Console.WriteLine()
          Console.WriteLine("{0} Summary:", operationNames(operation))
          Console.WriteLine("  Slowest time:  #{0}/{1} = {2} ticks", _
@@ -186,29 +184,6 @@ Class OperationsTimer
       Next operation
 
    End Sub
+   '</Snippet3>
 End Class
-'</Snippet3>
-=======
-'<Snippet1>
-Imports System.Diagnostics
-Imports System.Threading
-
-
-Class Program
-
-    Shared Sub Main(ByVal args() As String)
-        Dim stopWatch As New Stopwatch()
-        stopWatch.Start()
-        Thread.Sleep(10000)
-        stopWatch.Stop()
-        ' Get the elapsed time as a TimeSpan value.
-        Dim ts As TimeSpan = stopWatch.Elapsed
-
-        ' Format and display the TimeSpan value.
-        Dim elapsedTime As String = String.Format("{0:00}:{1:00}:{2:00}.{3:00}", ts.Hours, ts.Minutes, ts.Seconds, ts.Milliseconds / 10)
-        Console.WriteLine( "RunTime " + elapsedTime)
-
-    End Sub
-End Class
->>>>>>> 888bb64f55349b13f1342f20d22b825c7eb339d7
-'</Snippet1>
+'</Snippet1>

snippets/visualbasic/System.Diagnostics/Stopwatch/Overview/source1.vb

@@ -0,0 +1,21 @@
+'<Snippet1>
+Imports System.Diagnostics
+Imports System.Threading
+
+Class Program
+
+    Shared Sub Main(ByVal args() As String)
+        Dim stopWatch As New Stopwatch()
+        stopWatch.Start()
+        Thread.Sleep(10000)
+        stopWatch.Stop()
+        ' Get the elapsed time as a TimeSpan value.
+        Dim ts As TimeSpan = stopWatch.Elapsed
+
+        ' Format and display the TimeSpan value.
+        Dim elapsedTime As String = String.Format("{0:00}:{1:00}:{2:00}.{3:00}", ts.Hours, ts.Minutes, ts.Seconds, ts.Milliseconds / 10)
+        Console.WriteLine( "RunTime " + elapsedTime)
+
+    End Sub
+End Class
+'</Snippet1>

snippets/visualbasic/System.Reflection/Assembly/Load/Load2.vb renamed to snippets/visualbasic/System.Reflection/Assembly/Load/Load21.vb

@@ -16,6 +16,7 @@ Module Example
       Next
    End Sub
 End Module
+
 ' The example displays the following output:
 '   Public types in assembly sysglobl, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a:
 '      System.Globalization.CultureAndRegionInfoBuilder

snippets/visualbasic/System.Reflection/Assembly/Load/load1.vb

@@ -1,10 +1,9 @@
-<<<<<<< HEAD
 ' <Snippet1>
 Imports System.Reflection
 
 Class Class1
     Public Shared Sub Main()
-		' You must supply a valid fully qualified assembly name.            
+		' You must supply a valid fully qualified assembly name.
 		Dim SampleAssembly As [Assembly] = _
 			[Assembly].Load("SampleAssembly, Version=1.0.2004.0, Culture=neutral, PublicKeyToken=8744b20f8da049e3")
         Dim oType As Type
@@ -15,25 +14,3 @@ Class Class1
 	End Sub	'LoadSample
 End Class
 ' </Snippet1>
-=======
-' Visual Basic .NET Document
-Option Strict On
-
-' <Snippet1>
-Imports System.Reflection
-
-Module Example
-   Public Sub Main()
-      Dim longName As String = "system, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-      Dim assem As Assembly = Assembly.Load(longName)
-      If assem Is Nothing Then
-         Console.WriteLine("Unable to load assembly...")
-      Else
-         Console.WriteLine(assem.FullName)
-      End If
-   End Sub
-End Module
-' The example displays the following output:
-'       system, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-' </Snippet1>
->>>>>>> 888bb64f55349b13f1342f20d22b825c7eb339d7

snippets/visualbasic/System.Reflection/Assembly/Load/load11.vb

@@ -0,0 +1,20 @@
+' Visual Basic .NET Document
+Option Strict On
+
+' <Snippet1>
+Imports System.Reflection
+
+Module Example
+   Public Sub Main()
+      Dim longName As String = "system, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
+      Dim assem As Assembly = Assembly.Load(longName)
+      If assem Is Nothing Then
+         Console.WriteLine("Unable to load assembly...")
+      Else
+         Console.WriteLine(assem.FullName)
+      End If
+   End Sub
+End Module
+' The example displays the following output:
+'       system, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+' </Snippet1>

snippets/visualbasic/System.Text.RegularExpressions/RegexCompilationInfo/.ctor/makefile

@@ -1,59 +1,18 @@
-<<<<<<< HEAD
 '<snippet1>
 Class Sample
    Public Shared Sub Main()
       Dim val As [String]() =  {"apple", "orange", "grape", "pear"}
       Dim sep As [String] = ", "
       Dim result As [String]
-      
+
       Console.WriteLine("sep = '{0}'", sep)
       Console.WriteLine("val() = {{'{0}' '{1}' '{2}' '{3}'}}", val(0), val(1), val(2), val(3))
       result = [String].Join(sep, val, 1, 2)
       Console.WriteLine("String.Join(sep, val, 1, 2) = '{0}'", result)
    End Sub
-End Class 
+End Class
 'This example displays the following output:
 '       sep = ', '
 '       val() = {'apple' 'orange' 'grape' 'pear'}
 '       String.Join(sep, val, 1, 2) = 'orange, grape'
 '</snippet1>
-=======
-' Visual Basic .NET Document
-Option Strict On
-
-' <Snippet2>
-Imports System.Collections.Generic
-
-Module Example
-   Public Sub Main()
-      Dim maxPrime As Integer = 100
-      Dim primes As List(Of Integer) = GetPrimes(maxPrime)
-      Console.WriteLine("Primes less than {0}:", maxPrime)
-      Console.WriteLine("   {0}", String.Join(" ", primes))
-   End Sub
-   
-   Private Function GetPrimes(maxPrime As Integer) As List(Of Integer)
-      Dim values As Array = Array.CreateInstance(GetType(Integer), _
-                              New Integer() { maxPrime - 1}, New Integer(){ 2 }) 
-        ' Use Sieve of Eratosthenes to determine prime numbers.
-      For ctr As Integer = values.GetLowerBound(0) To _
-                           CInt(Math.Ceiling(Math.Sqrt(values.GetUpperBound(0))))
-         If CInt(values.GetValue(ctr)) = 1 Then Continue For
-         
-         For multiplier As Integer = ctr To maxPrime \ 2
-            If ctr * multiplier <= maxPrime Then values.SetValue(1, ctr * multiplier)
-         Next   
-      Next      
-      
-      Dim primes As New System.Collections.Generic.List(Of Integer)
-      For ctr As Integer = values.GetLowerBound(0) To values.GetUpperBound(0)
-         If CInt(values.GetValue(ctr)) = 0 Then primes.Add(ctr)
-      Next            
-      Return primes
-   End Function   
-End Module
-' The example displays the following output:
-'    Primes less than 100:
-'       2 3 5 7 11 13 17 19 23 29 31 37 41 43 47 53 59 61 67 71 73 79 83 89 97
-' </Snippet2>
->>>>>>> 888bb64f55349b13f1342f20d22b825c7eb339d7