]> git.mxchange.org Git - pizzaservice-core.git/blob - .gitattributes
projects / pizzaservice-core.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
Merge branch 'master' of /media/quix0r/INTENSO/Java Project/pizzaservice
[pizzaservice-core.git] / .gitattributes
1 <<<<<<< HEAD
2 # Use Linux/Uni* line-feed for new lines (prevents converting)
3 * text=lf
4 =======
5 # Auto detect text files and perform LF normalization
6 * text=auto
7 >>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c
Unnamed repository; edit this file 'description' to name the repository.