Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7296 from thinkerou/fix_orig

Browse Source 
Fix orig files for conflicting generated
pull/7451/head
Nicolas Noble 9 years ago committed by GitHub
parent 6b3361bc34 3a9ba6bd53
commit 9cd380c5e1
1 changed files with 3 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .gitignore

3
.gitignore vendored
Unescape View File

@ -96,3 +96,6 @@ Pods/
# Artifacts directory
artifacts/
# Git generated files for conflicting
*.orig

Write Preview
Loading…
Cancel
Save