resolve conflict

Author: bact

content/crosswalk/trove.md

@@ -3,6 +3,6 @@ title: "Crosswalk for Trove Software Map"
 image: "/img/sourceforge.png"
 ---
 
-[Trove Software Map](https://sourceforge.net/p/easyhtml5/tracinst/Software%20Map%20and%20Trove/#what-is-trove). Trove is the system used by SourceForge.net to classify software projects.  
+[Trove Software Map](https://sourceforge.net/p/easyhtml5/tracinst/Software%20Map%20and%20Trove/#what-is-trove). Trove is the system used by SourceForge.net to classify software projects.
 
 {{< crosswalk name="Trove Software Map" >}}