diff options
author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-06-20 12:43:08 -0400 |
---|---|---|
committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-06-20 12:43:08 -0400 |
commit | e64ecc89f94641d4054162eff4943f660f43030f (patch) | |
tree | c43ca79f9947b3e16f946e1dc5fd1d02f70ce571 /src/SMAPI/Framework/Patching/PatchHelper.cs | |
parent | df6e745c6b842290338317ed1d3e969ee222998c (diff) | |
parent | cb9ff7019995eff92104703f097856d2523e02ce (diff) | |
download | SMAPI-e64ecc89f94641d4054162eff4943f660f43030f.tar.gz SMAPI-e64ecc89f94641d4054162eff4943f660f43030f.tar.bz2 SMAPI-e64ecc89f94641d4054162eff4943f660f43030f.zip |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Framework/Patching/PatchHelper.cs')
-rw-r--r-- | src/SMAPI/Framework/Patching/PatchHelper.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/SMAPI/Framework/Patching/PatchHelper.cs b/src/SMAPI/Framework/Patching/PatchHelper.cs index 4cb436f0..d1aa0185 100644 --- a/src/SMAPI/Framework/Patching/PatchHelper.cs +++ b/src/SMAPI/Framework/Patching/PatchHelper.cs @@ -1,3 +1,4 @@ +#if !HARMONY_2 using System; using System.Collections.Generic; @@ -32,3 +33,4 @@ namespace StardewModdingAPI.Framework.Patching } } } +#endif |