Private GIT

Skip to content
Snippets Groups Projects
Commit d3375e00 authored by Alexandre Beloin's avatar Alexandre Beloin
Browse files

Merge branch 'eclipse_ignore_settings' of https://github.com/TagForce/SickRage... 

Merge branch 'eclipse_ignore_settings' of https://github.com/TagForce/SickRage into TagForce-eclipse_ignore_settings

Conflicts:
	.gitignore
parents eaca966f 3c60c308
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
.gitignore
+ 1
− 0
View file @ d3375e00
...@@ -40,6 +40,7 @@ Session.vim ...@@ -40,6 +40,7 @@ Session.vim
*.iml *.iml
.idea .idea
*.ipr *.ipr
.settings/*
# OS generated files # # OS generated files #
###################### ######################
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Another place to be (or not)