Update notes for 2018-11-08

This commit is contained in:
2018-11-08 09:02:20 +02:00
parent fecac58ec8
commit 51aa83e6c3
67 changed files with 196 additions and 970 deletions

View File

@ -20,8 +20,6 @@ Start working on DSpace 5.15.5 port:
$ git checkout -b 55new 5_x-prod
$ git reset --hard ilri/5_x-prod
$ git rebase -i dspace-5.5
" />
<meta property="og:type" content="article" />
<meta property="og:url" content="https://alanorth.github.io/cgspace-notes/2016-08/" /><meta property="article:published_time" content="2016-08-01T15:53:00&#43;03:00"/>
@ -43,10 +41,8 @@ Start working on DSpace 5.15.5 port:
$ git checkout -b 55new 5_x-prod
$ git reset --hard ilri/5_x-prod
$ git rebase -i dspace-5.5
"/>
<meta name="generator" content="Hugo 0.50" />
<meta name="generator" content="Hugo 0.51" />
@ -140,8 +136,6 @@ $ git reset --hard ilri/5_x-prod
$ git rebase -i dspace-5.5
</code></pre>
<p></p>
<ul>
<li>Lots of conflicts that don&rsquo;t make sense (ie, shouldn&rsquo;t conflict!)</li>
<li>This file in particular conflicts almost 10 times: <code>dspace/modules/xmlui-mirage2/src/main/webapp/themes/CGIAR/styles/_style.scss</code></li>