Skip to content

Commit

Permalink
Fixed merge mistake
Browse files Browse the repository at this point in the history
  • Loading branch information
rictic committed Oct 21, 2008
1 parent a1a0ece commit 70ec51f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ build
dist
frames
*.pyc
*.proofimage_cache
*.proof
image_cache

0 comments on commit 70ec51f

Please sign in to comment.