Commits

Armin Rigo committed 51688cd

Uh, this was checked in with "<<<<<<< local" markers.
Overwrite the resulting mess with the trunk's version.

  • Participants
  • Parent commits 76661de
  • Branches out-of-line-guards

Comments (0)

Files changed (1)

-<<<<<<< local
-.*\.pyc
-pypy/_cache
-.*~
-pypy/module/cpyext/src/.*.o
-compiled/
-include/
-lib_pypy/ctypes_config_cache=======
 syntax: glob
 *.py[co]
 *~
 ^pypy/module/cpyext/test/.+\.o$
 ^pypy/module/cpyext/test/.+\.obj$
 ^pypy/module/cpyext/test/.+\.manifest$
+^pypy/module/test_lib_pypy/ctypes_tests/.+\.o$
 ^pypy/doc/.+\.html$
 ^pypy/doc/basicblock\.asc$
 ^pypy/doc/.+\.svninfo$
 ^pypy/doc/discussion/.+\.html$
 ^include/.+\.h$
 ^include/.+\.inl$
+^pypy/doc/_build/.*$
 ^pypy/doc/config/.+\.html$
 ^pypy/doc/config/style\.css$
 ^pypy/doc/jit/.+\.html$
 ^pypy/doc/image/lattice3\.png$
 ^pypy/doc/image/stackless_informal\.png$
 ^pypy/doc/image/parsing_example.+\.png$
-^compiled>>>>>>> other
+^compiled
+^.git/
+^release/