Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fixed merge conflicts

  • Loading branch information...
commit 97e00d5cc1aee500ed3a22e555b510b06850bfec 1 parent 9b94016
Di Huynh authored April 23, 2012

Showing 1 changed file with 16 additions and 25 deletions. Show diff stats Hide diff stats

  1. 41  app/views/tags/rhsNav.html
41  app/views/tags/rhsNav.html
... ...
@@ -1,4 +1,3 @@
1  
-
2 1
 <div class="lhs-navBoxHeader" style="line-height:25px;padding-left:2px;">RSS FEED</div>
3 2
 <div class="lhs-navBoxBody">
4 3
   <a href="#">Latest News</a>
@@ -17,9 +16,8 @@
17 16
 <div class="lhs-navBoxHeader" style="line-height:25px;">BIRTHDAYS</div>
18 17
 <div class="lhs-navBoxBody" style="DISPLAY: block">
19 18
 <iframe style="DISPLAY: none" id="HiddenDiv" src="@{UpcomingBirthdays.showUpcomingBirthdays(_user.id)}" width = "158" height = "100%"
20  
-	     	 	scrolling = "auto" align = "middle" marginheight = "0" 
21  
-<<<<<<< HEAD
22  
-	     	 	marginwidth = "0" hspace = "5" vspace = "5" frameborder = "0" style="border:none;"> </iframe> 
  19
+          scrolling = "auto" align = "middle" marginheight = "0" 
  20
+          marginwidth = "0" hspace = "5" vspace = "5" frameborder = "0" style="border:none;"> </iframe> 
23 21
 
24 22
 
25 23
 
@@ -32,25 +30,18 @@
32 30
 <script language="JavaScript">
33 31
 function ShowHide(divId)
34 32
 {
35  
-		if(document.getElementById(divId).style.display == 'none')
36  
-		{
37  
-			document.getElementById(divId).style.display='block';
38  
-			document.getElementById('showDiv').style.display='block';
39  
-			document.getElementById('hideDiv').style.display='none';
40  
-			
41  
-		}
42  
-		else
43  
-		{
44  
-			document.getElementById(divId).style.display = 'none';
45  
-			document.getElementById('showDiv').style.display='none';
46  
-			document.getElementById('hideDiv').style.display='block';
47  
-		}
  33
+    if(document.getElementById(divId).style.display == 'none')
  34
+    {
  35
+      document.getElementById(divId).style.display='block';
  36
+      document.getElementById('showDiv').style.display='block';
  37
+      document.getElementById('hideDiv').style.display='none';
  38
+
  39
+    }
  40
+    else
  41
+    {
  42
+      document.getElementById(divId).style.display = 'none';
  43
+      document.getElementById('showDiv').style.display='none';
  44
+      document.getElementById('hideDiv').style.display='block';
  45
+    }
48 46
 }
49  
-</script>
50  
-=======
51  
-	     	 	marginwidth = "0" hspace = "5" vspace = "5" frameborder = "1"> 
52  
-          <div> -------------------</div>
53  
-          
54  
-          </iframe> 
55  
-</div>	
56  
->>>>>>> show today and this week's birthday, still waiting on the birthdays feature to work
  47
+</script>

0 notes on commit 97e00d5

Please sign in to comment.
Something went wrong with that request. Please try again.