Resolve API conflicts 1

MicrosoftDocs · Aug 27, 2018 · 5bf7f4b · 5bf7f4b
1 parent 52e3045
commit 5bf7f4b
Show file tree

Hide file tree

Showing 445 changed files with 0 additions and 2,910 deletions.
diff --git a/Office-Mac/GrantAccessToMultipleFiles.md b/Office-Mac/GrantAccessToMultipleFiles.md
@@ -31,15 +31,9 @@ The command returns whether the user granted permission or not.
 |True|The user grants permission to the files.|
 |False|The user denies permission to the files.|
 
-<<<<<<< HEAD
-**Note:** After the user grants permissions, the permissions are stored with the app. The user doesn’t need to grant permission to the file again. 
-
-**Example**
-=======
 **Note:** After the user grants permissions, the permissions are stored with the app. The user doesn’t need to grant permission to the file again.
 
 ## Example
->>>>>>> master
 
 ```vb
     Sub requestFileAccess()  

diff --git a/api/Publisher.Application.OfficeDataSourceObject.md b/api/Publisher.Application.OfficeDataSourceObject.md
@@ -39,15 +39,9 @@ Dim odsoTemp As Office.OfficeDataSourceObject
 Set odsoTemp = Application.OfficeDataSourceObject 
 
 With odsoTemp 
-<<<<<<< HEAD
- Debug.Print "Connection string: " &; .ConnectString 
- Debug.Print "Data source: " &; .DataSource 
- Debug.Print "Table: " &; .Table 
-=======
  Debug.Print "Connection string: " & .ConnectString 
  Debug.Print "Data source: " & .DataSource 
  Debug.Print "Table: " & .Table 
->>>>>>> master
 End With
 ```
 

diff --git a/api/Publisher.Application.Path.md b/api/Publisher.Application.Path.md
@@ -44,19 +44,11 @@ Sub PathNames()
  strName = Application.ActiveDocument.Name 
  strFullName = Application.ActiveDocument.FullName 
 
-<<<<<<< HEAD
- ' Note the file name &; path differences 
- ' while executing. 
- MsgBox "The path is: " &; strPath 
- MsgBox "The file name is: " &; strName 
- MsgBox "The path &; file name are: " &; strFullName 
-=======
  ' Note the file name & path differences 
  ' while executing. 
  MsgBox "The path is: " & strPath 
  MsgBox "The file name is: " & strName 
  MsgBox "The path & file name are: " & strFullName 
->>>>>>> master
 
 End Sub
 ```

diff --git a/api/Publisher.Application.PathSeparator.md b/api/Publisher.Application.PathSeparator.md
@@ -46,13 +46,8 @@ This example displays the path and file name of the active document.
 Sub PathFileName() 
 
  With Application 
-<<<<<<< HEAD
- MsgBox "The name of the active document: " &; vbLf &; _ 
- .Path &; .PathSeparator &; ActiveDocument.Name 
-=======
  MsgBox "The name of the active document: " & vbLf & _ 
  .Path & .PathSeparator & ActiveDocument.Name 
->>>>>>> master
  End With 
 
 End Sub

diff --git a/api/Publisher.Application.PicasToPoints.md b/api/Publisher.Application.PicasToPoints.md
@@ -60,17 +60,10 @@ Do While True
  If Val(strInput) = 0 Then Exit Do 
 
  ' Evaluate and display result. 
-<<<<<<< HEAD
- strOutput = Trim(strInput) &; " picas = " _ 
- &; Format(Application _ 
- .Picas ToPoints(Value:=Val(strInput)), _ 
- "0.00") &; " points" 
-=======
  strOutput = Trim(strInput) & " picas = " _ 
  & Format(Application _ 
  .Picas ToPoints(Value:=Val(strInput)), _ 
  "0.00") & " points" 
->>>>>>> master
 
  MsgBox strOutput 
 Loop

diff --git a/api/Publisher.Application.PixelsToPoints.md b/api/Publisher.Application.PixelsToPoints.md
@@ -60,17 +60,10 @@ Do While True
  If Val(strInput) = 0 Then Exit Do 
 
  ' Evaluate and display result. 
-<<<<<<< HEAD
- strOutput = Trim(strInput) &; " pixels = " _ 
- &; Format(Application _ 
- .PixelsToPoints(Value:=Val(strInput)), _ 
- "0.00") &; " points" 
-=======
  strOutput = Trim(strInput) & " pixels = " _ 
  & Format(Application _ 
  .PixelsToPoints(Value:=Val(strInput)), _ 
  "0.00") & " points" 
->>>>>>> master
 
  MsgBox strOutput 
 Loop 

diff --git a/api/Publisher.Application.PointsToCentimeters.md b/api/Publisher.Application.PointsToCentimeters.md
@@ -60,17 +60,10 @@ Do While True
  If Val(strInput) = 0 Then Exit Do 
 
  ' Evaluate and display result. 
-<<<<<<< HEAD
- strOutput = Trim(strInput) &; " points = " _ 
- &; Format(Application _ 
- .PointsToCentimeters(Value:=Val(strInput)), _ 
- "0.00") &; " cm" 
-=======
  strOutput = Trim(strInput) & " points = " _ 
  & Format(Application _ 
  .PointsToCentimeters(Value:=Val(strInput)), _ 
  "0.00") & " cm" 
->>>>>>> master
 
  MsgBox strOutput 
 Loop

diff --git a/api/Publisher.Application.PointsToEmus.md b/api/Publisher.Application.PointsToEmus.md
@@ -60,17 +60,10 @@ Do While True
  If Val(strInput) = 0 Then Exit Do 
 
  ' Evaluate and display result. 
-<<<<<<< HEAD
- strOutput = Trim(strInput) &; " points = " _ 
- &; Format(Application _ 
- .PointsToEmus(Value:=Val(strInput)), _ 
- "0.00") &; " emus" 
-=======
  strOutput = Trim(strInput) & " points = " _ 
  & Format(Application _ 
  .PointsToEmus(Value:=Val(strInput)), _ 
  "0.00") & " emus" 
->>>>>>> master
 
  MsgBox strOutput 
 Loop 

diff --git a/api/Publisher.Application.PointsToInches.md b/api/Publisher.Application.PointsToInches.md
@@ -60,17 +60,10 @@ Do While True
  If Val(strInput) = 0 Then Exit Do 
 
  ' Evaluate and display result. 
-<<<<<<< HEAD
- strOutput = Trim(strInput) &; " points = " _ 
- &; Format(Application _ 
- .PointsToInches(Value:=Val(strInput)), _ 
- "0.00") &; " in" 
-=======
  strOutput = Trim(strInput) & " points = " _ 
  & Format(Application _ 
  .PointsToInches(Value:=Val(strInput)), _ 
  "0.00") & " in" 
->>>>>>> master
 
  MsgBox strOutput 
 Loop 

diff --git a/api/Publisher.Application.PointsToLines.md b/api/Publisher.Application.PointsToLines.md
@@ -56,15 +56,9 @@ Selection.TextRange.Font.Size = 10
 
 ' Display result for 12 points. 
 strOutput = "12 points = " _ 
-<<<<<<< HEAD
- &; Format(Application _ 
- .PointsToLines(Value:=12), _ 
- "0.00") &; " lines"
-=======
  & Format(Application _ 
  .PointsToLines(Value:=12), _ 
  "0.00") & " lines"
->>>>>>> master
 ```
 
 

diff --git a/api/Publisher.Application.PointsToMillimeters.md b/api/Publisher.Application.PointsToMillimeters.md
@@ -60,17 +60,10 @@ Do While True
  If Val(strInput) = 0 Then Exit Do 
 
  ' Evaluate and display result. 
-<<<<<<< HEAD
- strOutput = Trim(strInput) &; " points = " _ 
- &; Format(Application _ 
- .PointsToMillimeters(Value:=Val(strInput)), _ 
- "0.00") &; " mm" 
-=======
  strOutput = Trim(strInput) & " points = " _ 
  & Format(Application _ 
  .PointsToMillimeters(Value:=Val(strInput)), _ 
  "0.00") & " mm" 
->>>>>>> master
 
  MsgBox strOutput 
 Loop 

diff --git a/api/Publisher.Application.PointsToPicas.md b/api/Publisher.Application.PointsToPicas.md
@@ -60,17 +60,10 @@ Do While True
  If Val(strInput) = 0 Then Exit Do 
 
  ' Evaluate and display result. 
-<<<<<<< HEAD
- strOutput = Trim(strInput) &; " points = " _ 
- &; Format(Application _ 
- .PointsToPicas(Value:=Val(strInput)), _ 
- "0.00") &; " picas" 
-=======
  strOutput = Trim(strInput) & " points = " _ 
  & Format(Application _ 
  .PointsToPicas(Value:=Val(strInput)), _ 
  "0.00") & " picas" 
->>>>>>> master
 
  MsgBox strOutput 
 Loop

diff --git a/api/Publisher.Application.PointsToPixels.md b/api/Publisher.Application.PointsToPixels.md
@@ -60,17 +60,10 @@ Do While True
  If Val(strInput) = 0 Then Exit Do 
 
  ' Evaluate and display result. 
-<<<<<<< HEAD
- strOutput = Trim(strInput) &; " points = " _ 
- &; Format(Application _ 
- .PointsToPixels(Value:=Val(strInput)), _ 
- "0.00") &; " pixels" 
-=======
  strOutput = Trim(strInput) & " points = " _ 
  & Format(Application _ 
  .PointsToPixels(Value:=Val(strInput)), _ 
  "0.00") & " pixels" 
->>>>>>> master
 
  MsgBox strOutput 
 Loop 

diff --git a/api/Publisher.Application.PointsToTwips.md b/api/Publisher.Application.PointsToTwips.md
@@ -60,17 +60,10 @@ Do While True
  If Val(strInput) = 0 Then Exit Do 
 
  ' Evaluate and display result. 
-<<<<<<< HEAD
- strOutput = Trim(strInput) &; " points = " _ 
- &; Format(Application _ 
- .PointsToTwips(Value:=Val(strInput)), _ 
- "0.00") &; " twips" 
-=======
  strOutput = Trim(strInput) & " points = " _ 
  & Format(Application _ 
  .PointsToTwips(Value:=Val(strInput)), _ 
  "0.00") & " twips" 
->>>>>>> master
 
  MsgBox strOutput 
 Loop 

diff --git a/api/Publisher.Application.ProductCode.md b/api/Publisher.Application.ProductCode.md
@@ -35,11 +35,7 @@ The following example displays the product code for Publisher.
 
 ```vb
 MsgBox "The product code for Microsoft Publisher is " _ 
-<<<<<<< HEAD
- &; ProductCode
-=======
  & ProductCode
->>>>>>> master
 ```
 
 

diff --git a/api/Publisher.Application.TemplateFolderPath.md b/api/Publisher.Application.TemplateFolderPath.md
@@ -59,11 +59,7 @@ Sub CreateNewPubTemplate()
  End With 
  End With 
  End With 
-<<<<<<< HEAD
- .SaveAs FileName:=strFolder &; "\NewPubTemplt.pub" 
-=======
  .SaveAs FileName:=strFolder & "\NewPubTemplt.pub" 
->>>>>>> master
  End With 
 End Sub
 ```

diff --git a/api/Publisher.Application.TwipsToPoints.md b/api/Publisher.Application.TwipsToPoints.md
@@ -60,17 +60,10 @@ Do While True
  If Val(strInput) = 0 Then Exit Do 
 
  ' Evaluate and display result. 
-<<<<<<< HEAD
- strOutput = Trim(strInput) &; " twips = " _ 
- &; Format(Application _ 
- .TwipsToPoints(Value:=Val(strInput)), _ 
- "0.00") &; " points" 
-=======
  strOutput = Trim(strInput) & " twips = " _ 
  & Format(Application _ 
  .TwipsToPoints(Value:=Val(strInput)), _ 
  "0.00") & " points" 
->>>>>>> master
 
  MsgBox strOutput 
 Loop 

diff --git a/api/Publisher.Application.Version.md b/api/Publisher.Application.Version.md
@@ -35,13 +35,8 @@ The following example displays the version and build number of the currently-ins
 
 ```vb
 MsgBox "You are currently running Microsoft Publisher, " _ 
-<<<<<<< HEAD
- &; " version " &; Application.Version &; ", build " _ 
- &; Application.Build &; "." 
-=======
  & " version " & Application.Version & ", build " _ 
  & Application.Build & "." 
->>>>>>> master
 
 ```
 

diff --git a/api/Publisher.BorderArt.Application.md b/api/Publisher.BorderArt.Application.md
@@ -31,11 +31,7 @@ This example displays the version and build information for Publisher.
 ```vb
 With Application 
  MsgBox "Current Publisher: version " _ 
-<<<<<<< HEAD
- &; .Version &; " build " &; .Build 
-=======
  & .Version & " build " & .Build 
->>>>>>> master
 End With
 ```
 

diff --git a/api/Publisher.BorderArtFormat.Application.md b/api/Publisher.BorderArtFormat.Application.md
@@ -31,11 +31,7 @@ This example displays the version and build information for Publisher.
 ```vb
 With Application 
  MsgBox "Current Publisher: version " _ 
-<<<<<<< HEAD
- &; .Version &; " build " &; .Build 
-=======
  & .Version & " build " & .Build 
->>>>>>> master
 End With
 ```
 

diff --git a/api/Publisher.BorderArts.Application.md b/api/Publisher.BorderArts.Application.md
@@ -31,11 +31,7 @@ This example displays the version and build information for Publisher.
 ```vb
 With Application 
  MsgBox "Current Publisher: version " _ 
-<<<<<<< HEAD
- &; .Version &; " build " &; .Build 
-=======
  & .Version & " build " & .Build 
->>>>>>> master
 End With
 ```
 

diff --git a/api/Publisher.BorderArts.Count.md b/api/Publisher.BorderArts.Count.md
@@ -30,13 +30,8 @@ This example displays the number of pages in the active document.
 
 ```vb
 Sub CountNumberOfPages() 
-<<<<<<< HEAD
- MsgBox "Your publication contains " &; _ 
- ActiveDocument.Pages.Count &; " page(s)." 
-=======
  MsgBox "Your publication contains " & _ 
  ActiveDocument.Pages.Count & " page(s)." 
->>>>>>> master
 End Sub
 ```
 
@@ -54,11 +49,7 @@ Sub CountNumberOfShapes()
  intShapes = intShapes + pg.Shapes.Count 
  Next 
 
-<<<<<<< HEAD
- MsgBox "Your publication contains " &; intShapes &; " shape(s)." 
-=======
  MsgBox "Your publication contains " & intShapes & " shape(s)." 
->>>>>>> master
 End Sub
 ```
 

diff --git a/api/Publisher.CalloutFormat.Application.md b/api/Publisher.CalloutFormat.Application.md
@@ -31,11 +31,7 @@ This example displays the version and build information for Publisher.
 ```vb
 With Application 
  MsgBox "Current Publisher: version " _ 
-<<<<<<< HEAD
- &; .Version &; " build " &; .Build 
-=======
  & .Version & " build " & .Build 
->>>>>>> master
 End With
 ```
 

diff --git a/api/Publisher.CatalogMergeShapes.Application.md b/api/Publisher.CatalogMergeShapes.Application.md
@@ -31,11 +31,7 @@ This example displays the version and build information for Publisher.
 ```vb
 With Application 
  MsgBox "Current Publisher: version " _ 
-<<<<<<< HEAD
- &; .Version &; " build " &; .Build 
-=======
  & .Version & " build " & .Build 
->>>>>>> master
 End With
 ```