2d1f7d3f8c
Conflicts: SparkleLib/Git/SparkleGit.cs SparkleLib/SparkleFetcherSSH.cs SparkleShare/SparkleControllerBase.cs |
||
---|---|---|
.. | ||
Makefile.am | ||
SparkleFetcherGit.cs | ||
SparkleGit.cs | ||
SparkleLib.Git.csproj | ||
SparkleRepoGit.cs |
2d1f7d3f8c
Conflicts: SparkleLib/Git/SparkleGit.cs SparkleLib/SparkleFetcherSSH.cs SparkleShare/SparkleControllerBase.cs |
||
---|---|---|
.. | ||
Makefile.am | ||
SparkleFetcherGit.cs | ||
SparkleGit.cs | ||
SparkleLib.Git.csproj | ||
SparkleRepoGit.cs |