Projects >> documentMaster >>87b06ecc0c63826762808cccc5002715d6488866

Chunk
Conflicting content
            String studentId = students[i].getId();
            String studentKey = students[i].getValue();
            String studentName = students[i].getName();
<<<<<<< HEAD
            int[] signature = students[i].getSignature();
=======
            String signature = students[i].getSignature();
            
            studentDir = studentsDir.resolve(studentKey);
            studentStaging = studentDir.resolve(stagingDirName);
            Files.createDirectories(studentStaging);
            
            plotfiles = Files.newDirectoryStream(quizStaging, "*.gnuplot");
            for (Path plotfile : plotfiles) {
                Files.copy(plotfile,
                    studentStaging.resolve(plotfile.getFileName()),
                    StandardCopyOption.REPLACE_EXISTING);
            }
            plotfiles.close();

            Path individualTex = studentStaging.resolve(
                String.format(nameFormat, studentId, quizId, testpaperId, "tex"));
            DocumentWriter individualDoc = new DocumentWriter(individualTex);
            individualDoc.writePreamble(assignment.getQuiz().getName());
            individualDoc.printHooksForVersions();
            individualDoc.beginQuiz();                       

            if (publish) {
                if (i == 0) {
                    compositeDoc.printAuthor("sample copy");
                    compositeDoc.printVersions(signature);
                }
            } else {
                compositeDoc.resetQuestionNumbering();
                compositeDoc.resetPageNumbering();
                compositeDoc.printAuthor(studentName);
                compositeDoc.printVersions(signature);
            }
            individualDoc.printAuthor(studentName);            
            individualDoc.printVersions(signature);
>>>>>>> 2ba1a837961ddc9e0c493649c2c6bc40fe0c1a66
            
            // QRKey = [TestPaperId(6)][studentIdx(3)][pageNum(1)]            
            String QRKey = String.format("%s%s", assignmentKey, studentKey);            
Solution content
            String studentId = students[i].getId();
            String studentKey = students[i].getValue();
            String studentName = students[i].getName();
            int[] signature = students[i].getSignature();
            
            // QRKey = [TestPaperId(6)][studentIdx(3)][pageNum(1)]            
            String QRKey = String.format("%s%s", assignmentKey, studentKey);            
File
Mint.java
Developer's decision
Version 1
Kind of conflict
For statement
If statement
Method invocation
Variable