diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2018-06-25 15:52:29 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-25 15:52:29 -0700 |
| commit | d6f346b4d55ae5112934297593ec1c56c3d178a5 (patch) | |
| tree | 021b5476160e465a20ef7d4ae4c0524351667233 /csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs | |
| parent | 3d603f481ed142d0be5e8e4dd6d1cb4457a51405 (diff) | |
| parent | 82d3d7d250645322f8a7343188e5ae6246a76414 (diff) | |
Merge pull request #4827 from acozzette/merge-3-6-x
Merge 3.6.x branch into master
Diffstat (limited to 'csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs b/csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs index 18a70b80..feaeba0e 100644 --- a/csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs +++ b/csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs @@ -34,10 +34,6 @@ using Google.Protobuf.Compatibility; using System; using System.Reflection; -#if NET35 -using Google.Protobuf.Compatibility; -#endif - namespace Google.Protobuf.Reflection { /// <summary> |