Removed git merge traces in some dotfiles

valeryan · Jun 14, 2016 · 1523e52 · 1523e52
1 parent 68505af
commit 1523e52
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -13,8 +13,4 @@ trim_trailing_whitespace = false
 
 [*.yml]
 indent_style = space
-<<<<<<< HEAD
 indent_size = 2
-=======
-indent_size = 2
->>>>>>> 3f2ed290c2c5c5b25df16e8abe3abe98904cc0aa
diff --git a/.gitattributes b/.gitattributes
@@ -5,8 +5,4 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .travis.yml export-ignore
-<<<<<<< HEAD
-phpunit.xml export-ignore
-=======
-phpunit.xml export-ignore
->>>>>>> 3f2ed290c2c5c5b25df16e8abe3abe98904cc0aa
+phpunit.xml export-ignore