Commit 1390162a authored by Alex Gil's avatar Alex Gil
Browse files

resolved conflicts with HEAD'

parents 3a3810ed a09dbbb0
...@@ -384,6 +384,7 @@ a specific page. As an example, the tag ...@@ -384,6 +384,7 @@ a specific page. As an example, the tag
will attempt to read the key `ruby` from file `/home/foo/bar.bib`. It will not will attempt to read the key `ruby` from file `/home/foo/bar.bib`. It will not
fallback to the default BibTeX file. fallback to the default BibTeX file.
#### Citation pointing to another page in your site #### Citation pointing to another page in your site
In some cases, you might want your citation to link to another page on your cite (ex. a separate works cited page). As a solution, add a relative path to your scholar configurations: In some cases, you might want your citation to link to another page on your cite (ex. a separate works cited page). As a solution, add a relative path to your scholar configurations:
...@@ -392,6 +393,7 @@ In some cases, you might want your citation to link to another page on your cite ...@@ -392,6 +393,7 @@ In some cases, you might want your citation to link to another page on your cite
relative: "/relative/path/file.html" relative: "/relative/path/file.html"
~~~ ~~~
#### Multiple bibliographies within one document (like [multibib.sty](http://www.ctan.org/pkg/multibib)) #### Multiple bibliographies within one document (like [multibib.sty](http://www.ctan.org/pkg/multibib))
When you have multiple `{% bibliography %}` sections in one file, When you have multiple `{% bibliography %}` sections in one file,
......
module Jekyll module Jekyll
class Scholar class Scholar
<<<<<<< HEAD
VERSION = '5.5.1'.freeze VERSION = '5.5.1'.freeze
=======
VERSION = '5.4.1'.freeze
>>>>>>> a09dbbb0596b2cc73951114a3b5ef2788e6acf37
end end
end end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment