Conflict.

microsoft · Apr 15, 2024 · 925051c · 925051c
1 parent b427b2d
commit 925051c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -9,7 +9,6 @@
   </PropertyGroup>
 
   <Target Name="CleanOutputpackagesDir" AfterTargets="Clean">
-    <RemoveDir Directories="$(MSBuildThisFileDirectory)outputpackages" />
   </Target>
 
   <PropertyGroup>

diff --git a/src/strings/PowerFxResources.en-US.resx b/src/strings/PowerFxResources.en-US.resx
@@ -3121,6 +3121,10 @@
     <value>Adds one or more items to the specified 'collection'. The items can be from a different table or collection (e.g. Collect(collection, source_collection)), or one or more records Collect(collection, {key1: val1, key2: val2, ...}, ...).</value>
     <comment>Description of 'Collect' function.</comment>
   </data>
+  <data name="CollectDataSourceArg" xml:space="preserve">
+    <value>data_source</value>
+    <comment>function_parameter - First parameter for the Collect function. The data source that you want to add data to. Translate this string. When translating, maintain as a single word (i.e., do not add spaces).</comment>
+  </data>
   <data name="CollectArg1" xml:space="preserve">
     <value>collection</value>
     <comment>function_parameter - First parameter for the Collect function - the name of the collection that will be created / appended to.</comment>