Projects >> hadoop-common >>6fa16f6a81b6917019806ce704b9ec440a20fe4c

Chunk
Conflicting content 
import org.apache.hadoop.util.VersionInfo;
import org.mortbay.util.ajax.JSON;

<<<<<<< HEAD
import com.google.common.base.Preconditions;
=======
import com.google.common.annotations.VisibleForTesting;
>>>>>>> 03155c8ede133f8dce1a6c3a4752e56b80d48c0b

/***************************************************
 * FSNamesystem does the actual bookkeeping work for the
Solution content 
import org.apache.hadoop.util.VersionInfo;
import org.mortbay.util.ajax.JSON;

import com.google.common.base.Preconditions;
import com.google.common.annotations.VisibleForTesting;

/***************************************************
 * FSNamesystem does the actual bookkeeping work for the
File
FSNamesystem.java
Developer's decision
Concatenation
Kind of conflict
Import