Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

restored some missing files from my repo that are in the code52 repo

  • Loading branch information...
commit f7622e577f8efceab3758d9d27dbff929540f44d 1 parent 2acfa2a
@NickJosevski NickJosevski authored
View
3  Extensions/BlogRss/BlogRss.csproj
@@ -12,6 +12,8 @@
<AssemblyName>BlogRss</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\jibbr\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -60,6 +62,7 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
View
1  Jabbot.AspNetBotHost/Jabbot.AspNetBotHost.csproj
@@ -16,6 +16,7 @@
<UseIISExpress>true</UseIISExpress>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\Jabbot\</SolutionDir>
<RestorePackages>true</RestorePackages>
+ <JSLintSkip>\Resources\coffee-script.js</JSLintSkip>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
View
18 Jabbot/Sprockets/ISprocketInitializer.cs.orig
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+<<<<<<< HEAD
+using System.Linq;
+=======
+using System.Linq;
+>>>>>>> Sorted usings.
+using System.Text;
+
+namespace Jabbot.Sprockets
+{
+ [InheritedExport]
+ public interface ISprocketInitializer
+ {
+ void Initialize(Bot bot);
+ }
+}
View
30 Jabbot/Sprockets/ISprocketInitializer.cs.orig.orig
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+<<<<<<< HEAD
+using System.ComponentModel.Composition;
+<<<<<<< HEAD
+using System.Linq;
+=======
+using System.Linq;
+>>>>>>> Sorted usings.
+using System.Text;
+=======
+<<<<<<< HEAD
+using System.ComponentModel.Composition;
+using System.Linq;
+using System.Text;
+=======
+using System.Linq;
+using System.Text;
+using System.ComponentModel.Composition;
+>>>>>>> Re-adding Initializer
+>>>>>>> b174a0b267e2f5a3d406863cbbb903beb3fce0a8
+
+namespace Jabbot.Sprockets
+{
+ [InheritedExport]
+ public interface ISprocketInitializer
+ {
+ void Initialize(Bot bot);
+ }
+}
Please sign in to comment.
Something went wrong with that request. Please try again.