Resolve conflicts in .gitattributes

b7dd1fae · Stan Hu · eb64efd4 · b7dd1fae
Commit b7dd1fae authored Jul 11, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

.gitattributes .gitattributes +0 -3

No files found.
--- a/.gitattributes
+++ b/.gitattributes
-<<<<<<< HEAD
 VERSION merge=ours
-=======
 Dangerfile gitlab-language=ruby
->>>>>>> upstream/master