From: Amber <amberisvibin@gmail.com>
Date: Fri, 18 Sep 2020 12:15:42 +0000 (+0000)
Subject: Docs: resolve conflict
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=c0ea0ad4fe14c90664c277ddf53f1a0c49b1ee4f;p=gwion.git

Docs: resolve conflict
---

c0ea0ad4fe14c90664c277ddf53f1a0c49b1ee4f
diff --cc docs/Benchmarks.mdr
index 64ef6686,bbacd653..be3d5fb6
--- a/docs/Benchmarks.mdr
+++ b/docs/Benchmarks.mdr
@@@ -1,10 -1,7 +1,8 @@@
  # Benchmarks
  
 +> @hide date
- 
 +> @hide cd Gwion; git log -n1
- 
  ## test
 -
 -<table><tr><td align="center">
 -@hide for a in $(find benchmark/results -type f -name "*.png"); do echo "<a href=:gwion:><img class=\"zoom\" src=\"./$(echo "$a" | sed 's/benchmark\/results/assets/')\" width=\"352px\"></a>"; done
 -</td></tr></table>
 +<table><tr><td align="center" style="border:none">
 +@hide bash scripts/list_benchmarks.sh
- </td></tr></table>
++</td></tr></table>