Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Gitignore update

Conflicts:

	.gitignore
  • Loading branch information...
commit fcc47f0438220b4211ff3bd76507c66085015cf1 1 parent 60d8ec5
@chadrem chadrem authored
Showing with 3 additions and 0 deletions.
  1. +3 −0  .gitignore
View
3  .gitignore
@@ -14,5 +14,8 @@ starling/doc/html/
# OS X folders
.DS_Store
+<<<<<<< HEAD
*.swc
+=======
+>>>>>>> 7cb39b3... Gitignore update
Please sign in to comment.
Something went wrong with that request. Please try again.