From: deshmukh <deshmukh>
Date: Fri, 4 Apr 2008 12:32:45 +0000 (+0000)
Subject: complete the merge
X-Git-Tag: v1_7_0_51~68
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;ds=sidebyside;h=db79642b0e433c59a718bc40c0a802e03a103db4;p=fs%2Flustre-release.git

complete the merge
---

diff --git a/build/buildcvs b/build/buildcvs
index 9e44b8f..467f87c 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -174,11 +174,7 @@ case "$lustretag" in
 	;;
 
     # CMD3
-<<<<<<< buildcvs
     HEAD|b_post_cmd3|b_HEAD_AT|b_new_cmd_sles10|b1_6_head_sync|b1_8_dir_ra|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_quota|b1_8_interop_server)
-=======
-    HEAD|b_post_cmd3|b_HEAD_AT|b_new_cmd_sles10|b1_6_head_sync|b1_8_dir_ra|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_quota|b_som)
->>>>>>> 1.111
         # Update b1_8 above when changing this.
         ldiskfstag="b1_8_iam"
         ;;