-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
In addition to the .NET example, this commit also includes: * Fixes compile error in the service example * Updates gradle wrapper
- Loading branch information
Showing
28 changed files
with
1,447 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
############################################################################### | ||
# Set default behavior to automatically normalize line endings. | ||
############################################################################### | ||
* text=auto | ||
|
||
############################################################################### | ||
# Set the merge driver for project and solution files | ||
# | ||
# Merging from the command prompt will add diff markers to the files if there | ||
# are conflicts (Merging from VS is not affected by the settings below, in VS | ||
# the diff markers are never inserted). Diff markers may cause the following | ||
# file extensions to fail to load in VS. An alternative would be to treat | ||
# these files as binary and thus will always conflict and require user | ||
# intervention with every merge. | ||
############################################################################### | ||
|
||
*.sln text eol=crlf | ||
*.csproj text eol=crlf | ||
*.vbproj text eol=crlf | ||
*.vcxproj text eol=crlf | ||
*.vcproj text eol=crlf | ||
*.dbproj text eol=crlf | ||
*.fsproj text eol=crlf | ||
*.lsproj text eol=crlf | ||
*.wixproj text eol=crlf | ||
*.modelproj text eol=crlf | ||
*.sqlproj text eol=crlf | ||
*.wmaproj text eol=crlf | ||
|
||
*.xproj text eol=crlf | ||
*.props text eol=crlf | ||
*.filters text eol=crlf | ||
*.vcxitems text eol=crlf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.