.gitignore

   1 <<<<<<< HEAD
   2 *.[oa]
   3 *~
   4 *.swp
   5 *.[eo][0-9][0-9][0-9][0-9]*
   6 =======
   7 # ignore compiled stuff
   8 *.[oa]
   9
  10 # ignore texteditors
  11 *.swp
  12 *~
  13
  14
  15 # ignore build dir
  16 build/
  17
  18 # ignored dirs form adasko
  19 gradcheck/
  20 mapcheck/
  21 run/
  22 sympcheck/
  23
  24 >>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1