Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:rocky/emacs-load-relative

Conflicts:
	.travis.yml
  • Loading branch information...
commit 566719d23a18809e75153b58478efe5b34dd1a2d 2 parents 97b7428 + 497513c
R. Bernstein authored
Showing with 4 additions and 0 deletions.
  1. +4 −0 .travis.yml
4 .travis.yml
View
@@ -9,5 +9,9 @@ script:
- curl -fsSkL https://raw.github.com/rejeep/carton/master/go | sh
- bash ~/.carton/bin/carton
- emacs -batch -q -no-site-file -eval '(message "%s" load-path)'
+<<<<<<< HEAD
- ls -l /home/travis/elpa
- EMACSLOADPATH=/usr/share/emacs/23.3/lisp:/home/travis/elpa/test-simple-20130710 /bin/sh ./autogen.sh && EMACSLOADPATH=./elpa/test-simple-20130710:/usr/share/emacs/23.3/lisp make check
+=======
+ - EMACSLOADPATH=/usr/share/emacs/23.3/lisp:./elpa/test-simple-20130710 /bin/sh ./autogen.sh && EMACSLOADPATH=./elpa/test-simple-20130710:/usr/share/emacs/23.3/lisp make check
+>>>>>>> 497513ccbc113ea79f24a31525935b647eb65f56
Please sign in to comment.
Something went wrong with that request. Please try again.