geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mark...@apache.org
Subject [28/37] incubator-geode git commit: Solved conflicts after PR #39
Date Wed, 09 Dec 2015 00:59:20 GMT
Solved conflicts after PR #39


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d0b593c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d0b593c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d0b593c9

Branch: refs/heads/develop
Commit: d0b593c98907a92d0be46dfa74d98453faa9acfe
Parents: 1c5fb68
Author: William Markito <wmarkito@pivotal.io>
Authored: Thu Nov 19 17:24:40 2015 -0800
Committer: William Markito <wmarkito@pivotal.io>
Committed: Thu Nov 19 17:24:40 2015 -0800

----------------------------------------------------------------------
 gemfire-site/content/community/index.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d0b593c9/gemfire-site/content/community/index.html
----------------------------------------------------------------------
diff --git a/gemfire-site/content/community/index.html b/gemfire-site/content/community/index.html
index 6ae7977..f28a4a7 100644
--- a/gemfire-site/content/community/index.html
+++ b/gemfire-site/content/community/index.html
@@ -20,7 +20,7 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic"
rel="stylesheet" type="text/css">
     <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
 
-
+    
     <script type="text/javascript"
       src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBYSxyIKS22zC4wSLFXZGR8QKXbGWLFwYw&sensor=false">
     </script>
@@ -189,7 +189,7 @@
             }
         };
     </script>
-
+    
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file.
-->
     <!--[if lt IE 9]>
@@ -244,7 +244,7 @@
     	    	<h2>Join Our Community of Contributors!</h2>
             <p>The Apache Geode team welcomes contributors who want to support the
Geode technology. Our community builds everything from this website, from the Geode code to
documentation and best practices information.</p>
 
-            <p>We especially welcome additions and corrections to the documentation,
wiki, and website to improve the user experience. Bug reports, fixes and additions to the
Apache Geode code are welcome. Helping users learn best practices also earns karma in our
community.</p>
+            <p>We especially welcome additions and corrections to the documentation,
wiki, and website to improve the user experience. Bug reports and fixes and additions to the
Apache Geode code are welcome. Helping users learn best practices also earns karma in our
community.</p>
 			</div>
 		</div>
 	</div>
@@ -317,8 +317,7 @@
       </div>
       <div class="col-md-3 done">
         	<h3><a href="https://www.youtube.com/channel/UCaY2q0UlWjAgEGL7uhCLs6A">Geode
ClubHouse</a></h3>
-
-        	<p>We meet every 15 days online for discussions around specific features,
detailing internals and discuss ongoing issues on JIRA at the Geode Clubhouse. All meetings
are recorded and videos are availabe in our <a href="https://www.youtube.com/channel/UCaY2q0UlWjAgEGL7uhCLs6A">YouTube</a>
channel.<p>
+        	<p>We meet every 15 days online for discussions around specific features,
detailing internals and discuss on-going issues on JIRA at the Geode Clubhouse. All meetings
are recorded and videos are availabe in our <a href="https://www.youtube.com/channel/UCaY2q0UlWjAgEGL7uhCLs6A">YouTube</a>
channel.<p>
       </div>
 	  </div>
 </section>


Mime
View raw message