Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/TeamCitySharp/ActionTypes/Agents.cs
#	src/TeamCitySharp/ActionTypes/BuildConfigs.cs
#	src/TeamCitySharp/ActionTypes/Builds.cs
#	src/TeamCitySharp/ActionTypes/IAgents.cs
#	src/TeamCitySharp/ActionTypes/IBuildConfigs.cs
#	src/TeamCitySharp/ActionTypes/IBuilds.cs
#	src/TeamCitySharp/ActionTypes/Projects.cs
#	src/TeamCitySharp/Connection/ITeamCityCaller.cs
#	src/TeamCitySharp/Connection/TeamCityCaller.cs
#	src/TeamCitySharp/Connection/TeamcityJsonEncoderDecoderConfiguration.cs
#	src/TeamCitySharp/DomainEntities/ArtifactDependency.cs
#	src/TeamCitySharp/DomainEntities/BuildTrigger.cs
#	src/TeamCitySharp/DomainEntities/NewProjectDescription.cs
#	src/TeamCitySharp/DomainEntities/ParentProjectWrapper.cs
#	src/TeamCitySharp/DomainEntities/Properties.cs
#	src/TeamCitySharp/DomainEntities/Property.cs
#	src/TeamCitySharp/DomainEntities/SnapshotDependency.cs
#	src/TeamCitySharp/DomainEntities/SourceBuildType.cs
#	src/TeamCitySharp/Locators/ProjectLocator.cs
#	src/TeamCitySharp/TeamCitySharp.csproj
  • Loading branch information
mavezeau committed Jan 26, 2016
2 parents 5054fab + 1437343 commit 61b97d4
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 61b97d4

Please sign in to comment.