anchor.diff:  	
   	
   	
  ->>>>>>> FETCH_HEAD
  +
   %>
   
   
  
positive.code: 		<!-- products -->
  		<div class="col-sm-10">
  			<%
  <<<<<<< HEAD
  				if (rs.isBeforeFirst()) {
  					String rsname, rsdescription, rsimg, rssku, rspid, rsprice;
  					while (rs.next()) {
  						rsname = rs.getString("name");
  						rsdescription = rs.getString("description");
  						rsimg = rs.getString("img_src");
  						rssku = rs.getString("sku");
  						rspid = String.valueOf(rs.getInt("product_id"));
  						rsprice = String.valueOf(rs.getDouble("price"));
  
  						if (rsimg == null)
  							rsimg = "default";
  						
  						String cid = "" + session.getAttribute("cid");
  						%>
  						<t:product name="<%=rsname %>" description="<%=rsdescription %>" imgurl="<%=rsimg %>" pid="<%=rspid %>" cid="<%=cid%>" />
  					<%}
  				} 
  				else 
  				{
  					if (role.equals("Owner")) 
  					{%>
  						<t:message type="warning" message="No Products in this category, please add a product"></t:message>
  					<%} 
  =======
  
  			if(!cid.equals("null"))
  			{
  
negative.code: 
  						int count = d_pstmt.executeUpdate();
  
  						if(count != 0){
  							%>
  							<t:message type="success" message="Product successfully updated"></t:message>
  