Permalink
Browse files

gitignore

  • Loading branch information...
1 parent e8bf1a3 commit 924f6cc52d6155aeb6e196ee37023584fd1ecb51 @mwotton committed Feb 23, 2011
Showing with 19 additions and 26 deletions.
  1. +19 −26 .gitignore
View
@@ -1,38 +1,31 @@
-.jhci-hist
+*.aux
+*.dvi
+*.gem
+*.hi
+*.log
+*.nav
+*.o
+*.out
+*.snm
+*.toc
+*.vrb
.#*
-hs.out_code.c
-hs.out
-pkg/
+.bundle
+.jhci-hist
RubyMap.hi
RubyMap.hs
RubyMap.o
+Setup
+dist
+hs.out
+hs.out_code.c
lib/RubyMap.chi
lib/RubyMap.chs.h
lib/RubyMap.hi
lib/RubyMap.hs
lib/RubyMap.o
lib/rshim.o
+pkg/
+pkg/*
sample/tmp
sample/tmp.old
-<<<<<<< HEAD
-Makefile
-*.o
-*.bundle
-*.so
-*.dll
-pkg
-.DS_Store
-=======
-Setup
-dist
-*.hi
-*.o
-*.aux
-*.log
-*.dvi
-*.snm
-*.toc
-*.vrb
-*.nav
-*.out
->>>>>>> f30efd0d09351b8486c345dff82865e7c6f9c55d

0 comments on commit 924f6cc

Please sign in to comment.