merge conflicts

Jenkinsfile2

@@ -3,7 +3,7 @@
     parameters{
         buildSelector(
             defaultSelector: lastSuccessful(),
-            name: 's444417-create-dataset',
+            name: 'BUILD_SELECTOR',
             description: 'Build selector for Copy artifact'
         )
 
@@ -19,12 +19,11 @@
                 copyArtifacts(
                     fingerprintArtifacts: true, 
                     projectName: 's444417-create-dataset',
-                    filter:'data.txt',
                     selector: buildParameter('BUILD_SELECTOR')
                 )
                 sh "chmod u+x ./startscript2.sh"
                 sh " ./startscript2.sh"
-                archiveArtifacts 'num_lines.txt'
+                archiveArtifacts artifacts: 'num_lines.txt'
             }
         }     
     } 

data.txt

@@ -0,0 +1,4 @@
+POSTED_BY,UNDER_CONSTRUCTION,RERA,BHK_NO.,BHK_OR_RK,SQUARE_FT,READY_TO_MOVE,RESALE,ADDRESS,LONGITUDE,LATITUDE,TARGET(PRICE_IN_LACS)
+Owner,0,0,2,BHK,1300.236407,1,1,"Ksfc Layout,Bangalore",12.96991,77.59796,55.0
+Dealer,0,0,2,BHK,1275.0,1,1,"Vishweshwara Nagar,Mysore",12.274538,76.644605,51.0
+Owner,0,0,2,BHK,933.1597222000001,1,1,"Jigani,Bangalore",12.778033,77.632191,43.0

startscript1.sh

@@ -1,4 +1,7 @@
 #!/bin/sh
 kaggle datasets download -d akash14/house-price-dataset
 unzip -o house-price-dataset.zip
-head -n $CUTOFF ./Participants_Data_HPP/Train.csv >> data.txt
+echo $CUTOFF
+
+head -n $CUTOFF ./Participants_Data_HPP/Train.csv > data.txt
+head -n $CUTOFF ./Participants_Data_HPP/Test.csv > dataTest.txt