Projects >> gerrit >>b352fc6c5e60933252a02b4e155532eee42e590b

Chunk
Conflicting content 
package com.google.gerrit.server.git;

<<<<<<< HEAD
import com.google.gerrit.common.data.ApprovalType;
=======
import static com.google.gerrit.server.git.GitRepositoryManager.REFS_NOTES_REVIEW;

>>>>>>> 79f88a11e81026248a11ae3d4b7edb68535d6226
import com.google.gerrit.common.data.ApprovalTypes;
import com.google.gerrit.reviewdb.ApprovalCategory;
import com.google.gerrit.reviewdb.Change;
Solution content 
package com.google.gerrit.server.git;

import static com.google.gerrit.server.git.GitRepositoryManager.REFS_NOTES_REVIEW;

import com.google.gerrit.common.data.ApprovalType;
import com.google.gerrit.common.data.ApprovalTypes;
import com.google.gerrit.reviewdb.ApprovalCategory;
import com.google.gerrit.reviewdb.Change;
File
CreateCodeReviewNotes.java
Developer's decision
Concatenation
Kind of conflict
Import