Преглед на файлове

Resolved merge conflict and updated git ignore

pull/2/head
Josh Wolfe преди 5 години
родител
ревизия
e2bb56174e
  1. 13
      emacs/.emacs.d/README.org
  2. 2
      git/.gitconfig

13
emacs/.emacs.d/README.org

@ -1404,10 +1404,15 @@ Stores all backups and temp files in =~/.bak.emacs/= @@ -1404,10 +1404,15 @@ Stores all backups and temp files in =~/.bak.emacs/=
* Testing
** Org Project
#+BEGIN_SRC emacs-lisp :tangle yes
(load-file "c:/dev/SideProjects/org-project/org-project.el")
(setq org-project-use-ag t)
#+END_SRC
#+BEGIN_SRC emacs-lisp :tangle yes
(cond ((file-exists-p "~/Projects/org-project/")
(load-file "~/Projects/org-project/org-project.el")
(setq org-project-use-ag t))
((file-exists-p "C:/dev/SideProjects/org-project/")
(load-file "C:/dev/SideProjects/org-project/org-project.el")
(setq org-project-use-ag t)))
#+END_SRC
** Extract Dates

2
git/.gitconfig

@ -3,3 +3,5 @@ @@ -3,3 +3,5 @@
name = Josh Wolfe
[push]
default = simple
[magit]
hideCampaign = true

Зареждане…
Отказ
Запис